squire_linden avatar squire_linden committed 85b4506 Merge

Merge in viewer-development

Comments (0)

Files changed (235)

doc/contributions.txt

 	STORM-1095
 	STORM-1236
 	STORM-1259
+	STORM-787
+	STORM-1313
+	STORM-899
+	STORM-1273
 Kage Pixel
 	VWR-11
 Ken March
 	STORM-844
 	STORM-643
 	STORM-954
+	STORM-1103
 Vadim Bigbear
 	VWR-2681
 Vector Hastings

indra/newview/app_settings/settings.xml

       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnableGestureSounds</key>
+    <map>
+      <key>Comment</key>
+      <string>Play sounds from gestures</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnableMouselook</key>
     <map>
       <key>Comment</key>
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FirstLoginThisInstall</key>
-    <map>
-      <key>Comment</key>
-      <string>Specifies that you have not successfully logged in since you installed the latest update</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>FirstName</key>
     <map>
       <key>Comment</key>
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RenderUseTriStrips</key>
-  <map>
-    <key>Comment</key>
-    <string>Use triangle strips for rendering prims.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
     <key>RenderUseFarClip</key>
     <map>
       <key>Comment</key>
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>NearbyListShowMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Show/hide map above nearby people list</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>NearbyListShowIcons</key>
     <map>
       <key>Comment</key>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>-1</integer>
+      <integer>20</integer>
     </map>
     <key>WaterEditPresets</key>
     <map>

indra/newview/llcofwearables.cpp

 	mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR);
 	mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR);
 
-
 	mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing");
 	mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2));
 
 		mAttachments->sort();
 		mAttachments->notify(REARRANGE); //notifying the parent about the list's size change (cause items were added with rearrange=false)
 	}
+	else
+	{
+		mAttachments->setNoItemsCommentText(LLTrans::getString("no_attachments"));
+	}
 
 	if (mBodyParts->size())
 	{
Add a comment to this file

indra/newview/llcofwearables.h

File contents unchanged.

indra/newview/llfloaterpreference.cpp

 	mCommitCallbackRegistrar.add("Pref.SelectSkin",				boost::bind(&LLFloaterPreference::onSelectSkin, this));
 	mCommitCallbackRegistrar.add("Pref.VoiceSetKey",			boost::bind(&LLFloaterPreference::onClickSetKey, this));
 	mCommitCallbackRegistrar.add("Pref.VoiceSetMiddleMouse",	boost::bind(&LLFloaterPreference::onClickSetMiddleMouse, this));
+	mCommitCallbackRegistrar.add("Pref.SetSounds",				boost::bind(&LLFloaterPreference::onClickSetSounds, this));
 //	mCommitCallbackRegistrar.add("Pref.ClickSkipDialogs",		boost::bind(&LLFloaterPreference::onClickSkipDialogs, this));
 //	mCommitCallbackRegistrar.add("Pref.ClickResetDialogs",		boost::bind(&LLFloaterPreference::onClickResetDialogs, this));
 	mCommitCallbackRegistrar.add("Pref.ClickEnablePopup",		boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
 		p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse"));
 	}
 }
+
+void LLFloaterPreference::onClickSetSounds()
+{
+	// Disable Enable gesture sounds checkbox if the master sound is disabled 
+	// or if sound effects are disabled.
+	getChild<LLCheckBoxCtrl>("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));
+}
+
 /*
 void LLFloaterPreference::onClickSkipDialogs()
 {

indra/newview/llfloaterpreference.h

 	void onClickSetKey();
 	void setKey(KEY key);
 	void onClickSetMiddleMouse();
+	void onClickSetSounds();
 //	void onClickSkipDialogs();
 //	void onClickResetDialogs();
 	void onClickEnablePopup();

indra/newview/llpanellandmarks.cpp

 	}
 
 	LLFolderViewEventListener* listenerp = current_item->getListener();
-	if (listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
+	if (listenerp && listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
 	{
 		listenerp->openItem();
 	}

indra/newview/llpanelplaces.cpp

 	{
 		if (mPlaceInfoType == LANDMARK_INFO_TYPE)
 		{
+			if (mItem.isNull())
+			{
+				llwarns << "NULL landmark item" << llendl;
+				llassert(mItem.notNull());
+				return;
+			}
+
 			LLSD payload;
 			payload["asset_id"] = mItem->getAssetUUID();
 			LLSD args; 

indra/newview/llviewermessage.cpp

 	{
 		return;
 	}
+
+	// Don't play sounds from gestures if they are not enabled.
+	if (!gSavedSettings.getBOOL("EnableGestureSounds")) return;
 		
 	gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
 	LLSD payload;
 
 	LLUUID object_id;
+	msg->getUUID("Data", "ObjectID", object_id);
+
+//	For compability with OS grids first check for presence of extended packet before fetching data.
     LLUUID owner_id;
-
-	msg->getUUID("Data", "ObjectID", object_id);
-    msg->getUUID("OwnerData", "OwnerID", owner_id);
+	if (gMessageSystem->getNumberOfBlocks("OwnerData") > 0)
+	{
+		msg->getUUID("OwnerData", "OwnerID", owner_id);
+	}
 
 	if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
 	{

indra/newview/llviewertexturelist.cpp

 	mUUIDMap.clear();
 	
 	mImageList.clear();
+
+	mInitialized = FALSE ; //prevent loading textures again.
 }
 
 void LLViewerTextureList::dump()
 												   LLGLenum primary_format, 
 												   const LLUUID& force_id)
 {
+	if(!mInitialized)
+	{
+		return NULL ;
+	}
+
 	std::string full_path = gDirUtilp->findSkinnedFilename("textures", filename);
 	if (full_path.empty())
 	{
 												   LLGLenum primary_format, 
 												   const LLUUID& force_id)
 {
+	if(!mInitialized)
+	{
+		return NULL ;
+	}
+
 	// generate UUID based on hash of filename
 	LLUUID new_id;
 	if (force_id.notNull())
 												   LLGLenum primary_format,
 												   LLHost request_from_host)
 {
+	if(!mInitialized)
+	{
+		return NULL ;
+	}
+
 	// Return the image with ID image_id
 	// If the image is not found, creates new image and
 	// enqueues a request for transmission

indra/newview/skins/default/xui/da/floater_about_land.xml

 				<combo_box.item label="Parker &amp; natur" name="item9"/>
 				<combo_box.item label="Beboelse" name="item10"/>
 				<combo_box.item label="Indkøb" name="item11"/>
+				<combo_box.item label="Leje" name="item13"/>
 				<combo_box.item label="Andet" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
 				<combo_box.item label="Parker &amp; natur" name="item9"/>
 				<combo_box.item label="Beboelse" name="item10"/>
 				<combo_box.item label="Indkøb" name="item11"/>
+				<combo_box.item label="Leje" name="item13"/>
 				<combo_box.item label="Andet" name="item12"/>
 			</combo_box>
 			<check_box label="Mature indhold" name="MatureCheck" tool_tip=""/>
 				(Defineret via estate)
 			</panel.string>
 			<panel.string name="allow_public_access">
-				Tillad adgang for alle ([MATURITY])
+				Tillad offentlig adgang ([MATURITY]) (Bemærk: Ellers oprettes blokeringslinier)
 			</panel.string>
 			<panel.string name="estate_override">
 				En eller flere af disse valg er indstillet på estate niveau

indra/newview/skins/default/xui/da/floater_map.xml

 	<floater.string name="ToolTipMsg">
 		[REGION](Dobbeltklik for at åbne kort, klik-og-træk for at panorere)
 	</floater.string>
+	<floater.string name="AltToolTipMsg">
+		[REGION](Dobbeltklik for at teleportere, træk for at panorere)
+	</floater.string>
 	<floater.string name="mini_map_caption">
 		MINIKORT
 	</floater.string>

indra/newview/skins/default/xui/da/floater_tools.xml

 		<radio_item label="Vælg overflade" name="radio select face"/>
 	</radio_group>
 	<check_box label="Redigér lænkede" name="checkbox edit linked parts"/>
+	<button label="Sammenkæd" name="link_btn"/>
+	<button label="Adskil" name="unlink_btn"/>
 	<text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt">
 		þ: [COUNT]
 	</text>

indra/newview/skins/default/xui/da/menu_attachment_self.xml

 	<menu_item_call label="Tag af" name="Detach"/>
 	<menu_item_call label="Sid ned" name="Sit Down Here"/>
 	<menu_item_call label="Stå op" name="Stand Up"/>
-	<menu_item_call label="Skift sæt" name="Change Outfit"/>
+	<menu_item_call label="Udseende" name="Change Outfit"/>
 	<menu_item_call label="Redigér mit sæt" name="Edit Outfit"/>
 	<menu_item_call label="Redigér min figur" name="Edit My Shape"/>
 	<menu_item_call label="Venner" name="Friends..."/>

indra/newview/skins/default/xui/da/menu_avatar_self.xml

 		<context_menu label="Tag af" name="Object Detach"/>
 		<menu_item_call label="Tag alt af" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Skift sæt" name="Chenge Outfit"/>
+	<menu_item_call label="Mit udseende" name="Chenge Outfit"/>
 	<menu_item_call label="Redigér mit sæt" name="Edit Outfit"/>
 	<menu_item_call label="Redigér min form" name="Edit My Shape"/>
 	<menu_item_call label="Venner" name="Friends..."/>

indra/newview/skins/default/xui/da/menu_bottomtray.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="Stemme aktiveret" name="EnableVoiceChat"/>
 	<menu_item_check label="Faste bevægelser" name="ShowGestureButton"/>
 	<menu_item_check label="Bevægelse knap" name="ShowMoveButton"/>
 	<menu_item_check label="Vis knap" name="ShowCameraButton"/>
 	<menu_item_check label="Foto knap" name="ShowSnapshotButton"/>
-	<menu_item_check label="Sidepanel knap" name="ShowSidebarButton"/>
 	<menu_item_check label="Bygge knap" name="ShowBuildButton"/>
 	<menu_item_check label="Søge knap" name="ShowSearchButton"/>
 	<menu_item_check label="Kort knap" name="ShowWorldMapButton"/>

indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml

 <?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
+<toggleable_menu name="Gear Menu">
 	<menu_item_call label="Profil" name="view_profile"/>
 	<menu_item_call label="Tilføj ven" name="add_friend"/>
 	<menu_item_call label="Besked" name="im"/>
 	<menu_item_call label="Rapportér" name="report"/>
 	<menu_item_call label="Frys" name="freeze"/>
 	<menu_item_call label="Smid ud" name="eject"/>
+	<menu_item_call label="Spark" name="kick"/>
+	<menu_item_call label="CSR" name="csr"/>
 	<menu_item_call label="Debug teksturer" name="debug"/>
 	<menu_item_call label="Find på kort" name="find_on_map"/>
 	<menu_item_call label="Zoom ind" name="zoom_in"/>
 	<menu_item_call label="Betal" name="pay"/>
 	<menu_item_call label="Del" name="share"/>
-</menu>
+</toggleable_menu>

indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml

-<?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
-	<menu_item_call label="Sid ned" name="sit_down_here"/>
-	<menu_item_call label="Stå op" name="stand_up"/>
-	<menu_item_call label="Skift sæt" name="change_outfit"/>
-	<menu_item_call label="Profil" name="my_profile"/>
-	<menu_item_call label="Venner" name="my_friends"/>
-	<menu_item_call label="Grupper" name="my_groups"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Gear Menu">
+	<menu_item_call label="Sid ned" name="Sit Down Here"/>
+	<menu_item_call label="Stå op" name="Stand Up"/>
+	<context_menu label="Tag af" name="Take Off &gt;">
+		<context_menu label="Tøj" name="Clothes &gt;">
+			<menu_item_call label="Trøje" name="Shirt"/>
+			<menu_item_call label="Bukser" name="Pants"/>
+			<menu_item_call label="Nederdel" name="Skirt"/>
+			<menu_item_call label="Sko" name="Shoes"/>
+			<menu_item_call label="Strømper" name="Socks"/>
+			<menu_item_call label="Jakke" name="Jacket"/>
+			<menu_item_call label="Handsker" name="Gloves"/>
+			<menu_item_call label="Undertrøje" name="Self Undershirt"/>
+			<menu_item_call label="Underbukser" name="Self Underpants"/>
+			<menu_item_call label="Tatovering" name="Self Tattoo"/>
+			<menu_item_call label="Alpha" name="Self Alpha"/>
+			<menu_item_call label="Alt tøj" name="All Clothes"/>
+		</context_menu>
+		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="Tag af" name="Object Detach"/>
+		<menu_item_call label="Tag alt af" name="Detach All"/>
+	</context_menu>
+	<menu_item_call label="Skift sæt" name="Chenge Outfit"/>
+	<menu_item_call label="Redigér sæt" name="Edit Outfit"/>
+	<menu_item_call label="Redigér min figur" name="Edit My Shape"/>
+	<menu_item_call label="Mine venner" name="Friends..."/>
+	<menu_item_call label="Mine grupper" name="Groups..."/>
+	<menu_item_call label="Min profil" name="Profile..."/>
 	<menu_item_call label="Debug teksturer" name="Debug..."/>
-</menu>
+</toggleable_menu>

indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml

 	<menu_item_call label="Nyt vindue" name="new_window"/>
 	<menu_item_check label="Sortér efter navn" name="sort_by_name"/>
 	<menu_item_check label="Sortér efter nyeste" name="sort_by_recent"/>
+	<menu_item_check label="Sortér altid mapper efter navn" name="sort_folders_by_name"/>
 	<menu_item_check label="Vis System mapper øverst" name="sort_system_folders_to_top"/>
 	<menu_item_call label="Vis filtre" name="show_filters"/>
 	<menu_item_call label="Nulstil filtre" name="reset_filters"/>

indra/newview/skins/default/xui/da/menu_object.xml

 		<context_menu label="Vedhæft" name="Object Attach"/>
 		<context_menu label="Vedhæft HUD" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Fjern" name="Remove">
+	<context_menu label="Administrér" name="Remove">
 		<menu_item_call label="Rapportér misbrug" name="Report Abuse..."/>
 		<menu_item_call label="Blokér" name="Object Mute"/>
 		<menu_item_call label="Returnér" name="Return..."/>
-		<menu_item_call label="Slet" name="Delete"/>
 	</context_menu>
 	<menu_item_call label="Tag" name="Pie Object Take"/>
 	<menu_item_call label="Tag kopi" name="Take Copy"/>
 	<menu_item_call label="Betal" name="Pay..."/>
 	<menu_item_call label="Køb" name="Buy..."/>
+	<menu_item_call label="Slet" name="Delete"/>
 </context_menu>

indra/newview/skins/default/xui/da/menu_places_gear_folder.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_folder_gear">
 	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
 	<menu_item_call label="Tilføj mappe" name="add_folder"/>
+	<menu_item_call label="Gendan genstand" name="restore_item"/>
 	<menu_item_call label="Klip" name="cut"/>
 	<menu_item_call label="Kopiér" name="copy_folder"/>
 	<menu_item_call label="Sæt ind" name="paste"/>
 	<menu_item_call label="Udvid alle mapper" name="expand_all"/>
 	<menu_item_call label="Luk alle mapper" name="collapse_all"/>
 	<menu_item_check label="Sortér efter dato" name="sort_by_date"/>
-</menu>
+</toggleable_menu>

indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_ladmark_gear">
+<toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleportér" name="teleport"/>
 	<menu_item_call label="Mere information" name="more_info"/>
 	<menu_item_call label="Vis på kort" name="show_on_map"/>
 	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
 	<menu_item_call label="Tilføj mappe" name="add_folder"/>
+	<menu_item_call label="Gendan genstand" name="restore_item"/>
 	<menu_item_call label="Klip" name="cut"/>
 	<menu_item_call label="Kopiér landemærke" name="copy_landmark"/>
 	<menu_item_call label="Kopiér SLurl" name="copy_slurl"/>
 	<menu_item_call label="Luk alle mapper" name="collapse_all"/>
 	<menu_item_check label="Sortér efter dato" name="sort_by_date"/>
 	<menu_item_call label="Opret favorit" name="create_pick"/>
-</menu>
+</toggleable_menu>

indra/newview/skins/default/xui/da/menu_viewer.xml

 		<menu_item_call label="Mit instrumentpanel" name="Manage My Account"/>
 		<menu_item_call label="Køb L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Profil" name="Profile"/>
-		<menu_item_call label="Skift sæt" name="ChangeOutfit"/>
+		<menu_item_call label="Udseende" name="ChangeOutfit"/>
 		<menu_item_check label="Beholdning" name="Inventory"/>
 		<menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Mine bevægelser" name="Gestures"/>
 	<menu label="Verden" name="World">
 		<menu_item_check label="Mini-kort" name="Mini-Map"/>
 		<menu_item_check label="Verdenskort" name="World Map"/>
+		<menu_item_check label="Søg" name="Search"/>
 		<menu_item_call label="Foto" name="Take Snapshot"/>
 		<menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/>
 		<menu label="Profil for sted" name="Land">
 		<menu label="Vis info" name="Display Info">
 			<menu_item_check label="Vis tid" name="Show Time"/>
 			<menu_item_check label="Vis gengivelses information" name="Show Render Info"/>
+			<menu_item_check label="Vis tekstur information" name="Show Texture Info"/>
 			<menu_item_check label="Vis farve under cursor" name="Show Color Under Cursor"/>
+			<menu_item_check label="Vis memory" name="Show Memory"/>
 			<menu_item_check label="Vis opdateringer på objekter" name="Show Updates"/>
 		</menu>
 		<menu label="Fremtving en fejl" name="Force Errors">
 			<menu_item_check label="Tilfældige framerates" name="Randomize Framerate"/>
 			<menu_item_check label="Frame test" name="Frame Test"/>
 		</menu>
+		<menu label="Render Metadata" name="Render Metadata">
+			<menu_item_check label="Opdatér type" name="Update Type"/>
+		</menu>
 		<menu label="Gengivelse" name="Rendering">
 			<menu_item_check label="Akser" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>

indra/newview/skins/default/xui/da/notifications.xml

 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
-		Kunne ikke oprette forbindelse til [SECOND_LIFE_GRID].
-&apos;[DIAGNOSTIC]&apos;
-Make sure your Internet connection is working properly.
+		Kunne ikke tilslutte til  [SECOND_LIFE_GRID].
+    &apos;[DIAGNOSTIC]&apos;
+Check at Internet forbindelsen fungerer korrekt.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
 	<notification name="InvalidCredentialFormat">
 		Du skal indtaste enten dit brugernavn eller både dit fornavn og efternavn for din avatar i brugernavn feltet, derefter log på igen.
 	</notification>
-	<notification name="AddClassified">
-		Annoncer vil vises i &apos;Annoncer&apos; sektionen i søge biblioteket og på [http://secondlife.com/community/classifieds secondlife.com] i en uge.
-Udfyld din annonce og klik på &apos;Udgiv...&apos; for at tilf&apos;je den til biblioteket.				
-Du vil blive spurgt om en pris når du klikker på &apos;Udgiv&apos;.
-Jo mere du betaler, jo højere oppe på listen vises annoncen, og den vil også optræde højere oppe når personer søger.
-		<usetemplate ignoretext="Hvordan man opretter en annonce" name="okcancelignore" notext="Cancel" yestext="OK"/>
-	</notification>
 	<notification name="DeleteMedia">
 		Du har valgt at slette media tilknyttet denne overflade.
 Er du sikker på at du vil fortsætte?
 
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 
-Med følgende beboere:
+Me følgende beboere:
 
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ok"/>
 	<notification label="Undersøg verden" name="HintDestinationGuide">
 		Destinationsguiden indeholder tusinder af nye steder der kan opleves. Vælg venligst et sted og vælg Teleport for at komme derhen.
 	</notification>
-	<notification label="Ændre dit udseende" name="HintAvatarPicker">
-		Kunne du tænke dig at prøve et nyt udseende? Klik på knappen nedenfor for at se flere avatarer.
-	</notification>
 	<notification label="Side panel" name="HintSidePanel">
 		Få hurtig tilgang til din beholdning, sæt, profiler og andet i dette side panel.
 	</notification>
 			<button name="cancel" text="Annullér"/>
 		</form>
 	</notification>
+	<notification label="" name="ModeChange">
+		For at skifte tilstand skal du genstarte programmet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoClassifieds">
+		Oprettelse og redigering af annoncer er kun muligt i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoGroupInfo">
+		Oprettelse og redigering af grupper er kun muligt i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoPicks">
+		Oprettelse og redigering af favoritter er kun mulig i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoWorldMap">
+		Det er kun muligt at se verdenskortet i avanceret tilstand.Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoVoiceCall">
+		Stemme kald kan kun benttes i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand?
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoAvatarShare">
+		Det er kun mulig at dele i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand?
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
+	<notification label="" name="NoAvatarPay">
+		Det er kun muligt at betale andre beboere i avanceret tilstand. Ønsker du at logge ud for at skifte tilstand?
+		<usetemplate name="okcancelbuttons" notext="Afslut ikke" yestext="Afslut"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Det ser ikke ud til at din hardware opfylder minimumskravene til [APP_NAME]. [APP_NAME] kræver et OpenGL grafikkort som understøter &apos;multitexture&apos;. Check eventuelt om du har de nyeste drivere for grafikkortet, og de nyeste service-packs og patches til dit operativsystem.
 

indra/newview/skins/default/xui/da/panel_login.xml

 			</text>
 			<check_box label="Husk password" name="remember_check"/>
 			<button label="Log på" name="connect_btn"/>
+			<text name="mode_selection_text">
+				Tilstand:
+			</text>
+			<combo_box name="mode_combo" tool_tip="Vælg ønsket tilstand. Vælg basis for hurtig og nem udforskning og chat. Vælg avanceret for at få adgang til flere muligheder.">
+				<combo_box.item label="Basis" name="Basic"/>
+				<combo_box.item label="Avanceret" name="Advanced"/>
+			</combo_box>
 			<text name="start_location_text">
 				Start ved:
 			</text>

indra/newview/skins/default/xui/da/panel_nearby_media.xml

 		<button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt på"/>
 		<button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt på"/>
 		<button name="open_prefs_btn" tool_tip="Vis media preferencer"/>
-		<button label="Mere &gt;&gt;" label_selected="Mindre &lt;&lt;" name="more_btn" tool_tip="Advancerede kontroller"/>
+		<button label="Mere &gt;&gt;" label_selected="&lt;&lt; Mindre" name="more_btn" tool_tip="Advancerede kontroller"/>
 		<button label="Mere &gt;&gt;" label_selected="Mindre &lt;&lt;" name="less_btn" tool_tip="Advancerede kontroller"/>
 	</panel>
 	<panel name="nearby_media_panel">

indra/newview/skins/default/xui/da/panel_people.xml

 	<string name="groups_filter_label" value="Filtrér grupper"/>
 	<string name="no_filtered_groups_msg" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/groups/[SEARCH_TERM] Søg]."/>
 	<string name="no_groups_msg" value="Leder du efter grupper at være med i? Prøv [secondlife:///app/search/groups Søg]."/>
+	<string name="MiniMapToolTipMsg" value="[REGION](Dobbeltklik for at åbne kort, træk for at panorere)"/>
+	<string name="AltMiniMapToolTipMsg" value="[REGION](Dobbelt-klik fot at teleportere, træk for at panorere)"/>
 	<filter_editor label="Filtrér" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="TÆT PÅ" name="nearby_panel">

indra/newview/skins/default/xui/da/panel_preferences_sound.xml

 	</panel.string>
 	<slider label="Generel" name="System Volume"/>
 	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">Sluk lyd når minimeret</text>
+	<text name="mute_chb_label">
+		Sluk lyd når minimeret
+	</text>
 	<slider label="Knapper" name="UI Volume"/>
 	<slider label="Omgivelser" name="Wind Volume"/>
 	<slider label="Lyd effekter" name="SFX Volume"/>

indra/newview/skins/default/xui/da/panel_profile.xml

 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
+	<string name="name_text_args">
+		[NAME]
+	</string>
+	<string name="display_name_text_args">
+		[DISPLAY_NAME]
+	</string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<scroll_container name="profile_scroll">
 					<text name="title_acc_status_text" value="Konto status:"/>
 					<text name="title_partner_text" value="Partner:"/>
 					<panel name="partner_data_panel">
-						<name_box initial_value="(henter)" name="partner_text"/>
+						<text initial_value="(henter)" name="partner_text"/>
 					</panel>
 					<text name="title_groups_text" value="Grupper:"/>
 				</panel>

indra/newview/skins/default/xui/da/panel_script_ed.xml

 	<panel.string name="Title">
 		Script: [NAME]
 	</panel.string>
+	<panel.string name="external_editor_not_set">
+		Vælg en editor ved at opsætte miljø-variablen LL_SCRIPT_EDITOR eller opsætning af Ekstern editor.
+	</panel.string>
 	<menu_bar name="script_menu">
 		<menu label="Filer" name="File">
 			<menu_item_call label="Gem" name="Save"/>

indra/newview/skins/default/xui/da/strings.xml

 	</string>
 	<string name="WornOnAttachmentPoint" value=" (båret på [ATTACHMENT_POINT])"/>
 	<string name="ActiveGesture" value="[GESLABEL] (aktiv)"/>
-	<string name="Chat" value=" Chat : "/>
+	<string name="Chat Message" value="Chat :"/>
 	<string name="Sound" value=" Lyd : "/>
 	<string name="Wait" value=" --- Vent : "/>
 	<string name="AnimFlagStop" value=" Stop Animation :   "/>
 	<string name="accel-win-shift">
 		Shift+
 	</string>
-	<string name="Esc">
-		Esc
-	</string>
-	<string name="Home">
-		Hjem
-	</string>
 	<string name="FileSaved">
 		Fil gemt
 	</string>
 	<string name="Other">
 		Andet
 	</string>
+	<string name="Rental">
+		Leje
+	</string>
 	<string name="Any">
 		Enhver
 	</string>
 	<string name="Notices">
 		Beskeder
 	</string>
-	<string name="Chat">
+	<string name="Chat" value=" Chat : ">
 		Chat
 	</string>
 	<string name="DeleteItems">
 	<string name="EmptyOutfitText">
 		Der er ingen genstande i dette sæt
 	</string>
+	<string name="ExternalEditorNotSet">
+		Vælg en editor via opsætningen for Ekstern editor.
+	</string>
+	<string name="ExternalEditorNotFound">
+		Kan ikke benytte deb eksterne editor der er angivet.
+Prøv at omkrandse stien til editor med anførselstegn.				
+(f.eks. &quot;/stil til min editor&quot; &quot;%s&quot;)
+	</string>
+	<string name="ExternalEditorCommandParseError">
+		Fejl ved håndtering af kommando til ekstern editor.
+	</string>
+	<string name="ExternalEditorFailedToRun">
+		Den eksterne editor kunne ikke startes.
+	</string>
+	<string name="Esc">
+		Esc
+	</string>
+	<string name="Space">
+		Space
+	</string>
+	<string name="Enter">
+		Enter
+	</string>
+	<string name="Tab">
+		Tab
+	</string>
+	<string name="Ins">
+		Ins
+	</string>
+	<string name="Del">
+		Del
+	</string>
+	<string name="Backsp">
+		Backsp
+	</string>
+	<string name="Shift">
+		Shift
+	</string>
+	<string name="Ctrl">
+		Ctrl
+	</string>
+	<string name="Alt">
+		Alt
+	</string>
+	<string name="CapsLock">
+		CapsLock
+	</string>
+	<string name="Home">
+		Hjem
+	</string>
+	<string name="End">
+		End
+	</string>
+	<string name="PgUp">
+		PgUp
+	</string>
+	<string name="PgDn">
+		PgDn
+	</string>
+	<string name="F1">
+		F1
+	</string>
+	<string name="F2">
+		F2
+	</string>
+	<string name="F3">
+		F3
+	</string>
+	<string name="F4">
+		F4
+	</string>
+	<string name="F5">
+		F5
+	</string>
+	<string name="F6">
+		F6
+	</string>
+	<string name="F7">
+		F7
+	</string>
+	<string name="F8">
+		F8
+	</string>
+	<string name="F9">
+		F9
+	</string>
+	<string name="F10">
+		F10
+	</string>
+	<string name="F11">
+		F11
+	</string>
+	<string name="F12">
+		F12
+	</string>
+	<string name="Add">
+		Tilføj
+	</string>
+	<string name="Subtract">
+		Træk fra
+	</string>
+	<string name="Multiply">
+		Multiplicer
+	</string>
+	<string name="Divide">
+		Divider
+	</string>
+	<string name="PAD_DIVIDE">
+		PAD_DIVIDE
+	</string>
+	<string name="PAD_LEFT">
+		PAD_LEFT
+	</string>
+	<string name="PAD_RIGHT">
+		PAD_RIGHT
+	</string>
+	<string name="PAD_DOWN">
+		PAD_DOWN
+	</string>
+	<string name="PAD_UP">
+		PAD_UP
+	</string>
+	<string name="PAD_HOME">
+		PAD_HOME
+	</string>
+	<string name="PAD_END">
+		PAD_END
+	</string>
+	<string name="PAD_PGUP">
+		PAD_PGUP
+	</string>
+	<string name="PAD_PGDN">
+		PAD_PGDN
+	</string>
+	<string name="PAD_CENTER">
+		PAD_CENTER
+	</string>
+	<string name="PAD_INS">
+		PAD_INS
+	</string>
+	<string name="PAD_DEL">
+		PAD_DEL
+	</string>
+	<string name="PAD_Enter">
+		PAD_Enter
+	</string>
+	<string name="PAD_BUTTON0">
+		PAD_BUTTON0
+	</string>
+	<string name="PAD_BUTTON1">
+		PAD_BUTTON1
+	</string>
+	<string name="PAD_BUTTON2">
+		PAD_BUTTON2
+	</string>
+	<string name="PAD_BUTTON3">
+		PAD_BUTTON3
+	</string>
+	<string name="PAD_BUTTON4">
+		PAD_BUTTON4
+	</string>
+	<string name="PAD_BUTTON5">
+		PAD_BUTTON5
+	</string>
+	<string name="PAD_BUTTON6">
+		PAD_BUTTON6
+	</string>
+	<string name="PAD_BUTTON7">
+		PAD_BUTTON7
+	</string>
+	<string name="PAD_BUTTON8">
+		PAD_BUTTON8
+	</string>
+	<string name="PAD_BUTTON9">
+		PAD_BUTTON9
+	</string>
+	<string name="PAD_BUTTON10">
+		PAD_BUTTON10
+	</string>
+	<string name="PAD_BUTTON11">
+		PAD_BUTTON11
+	</string>
+	<string name="PAD_BUTTON12">
+		PAD_BUTTON12
+	</string>
+	<string name="PAD_BUTTON13">
+		PAD_BUTTON13
+	</string>
+	<string name="PAD_BUTTON14">
+		PAD_BUTTON14
+	</string>
+	<string name="PAD_BUTTON15">
+		PAD_BUTTON15
+	</string>
+	<string name="-">
+		-
+	</string>
+	<string name="=">
+		=
+	</string>
+	<string name="`">
+		`
+	</string>
+	<string name=";">
+		;
+	</string>
+	<string name="[">
+		[
+	</string>
+	<string name="]">
+		]
+	</string>
+	<string name="\">
+		\
+	</string>
+	<string name="0">
+		0
+	</string>
+	<string name="1">
+		1
+	</string>
+	<string name="2">
+		2
+	</string>
+	<string name="3">
+		3
+	</string>
+	<string name="4">
+		4
+	</string>
+	<string name="5">
+		5
+	</string>
+	<string name="6">
+		6
+	</string>
+	<string name="7">
+		7
+	</string>
+	<string name="8">
+		8
+	</string>
+	<string name="9">
+		9
+	</string>
+	<string name="A">
+		A
+	</string>
+	<string name="B">
+		B
+	</string>
+	<string name="C">
+		C
+	</string>
+	<string name="D">
+		D
+	</string>
+	<string name="E">
+		E
+	</string>
+	<string name="F">
+		F
+	</string>
+	<string name="G">
+		G
+	</string>
+	<string name="H">
+		H
+	</string>
+	<string name="I">
+		I
+	</string>
+	<string name="J">
+		J
+	</string>
+	<string name="K">
+		K
+	</string>
+	<string name="L">
+		L
+	</string>
+	<string name="M">
+		M
+	</string>
+	<string name="N">
+		N
+	</string>
+	<string name="O">
+		O
+	</string>
+	<string name="P">
+		P
+	</string>
+	<string name="Q">
+		Q
+	</string>
+	<string name="R">
+		R
+	</string>
+	<string name="S">
+		S
+	</string>
+	<string name="T">
+		T
+	</string>
+	<string name="U">
+		U
+	</string>
+	<string name="V">
+		V
+	</string>
+	<string name="W">
+		W
+	</string>
+	<string name="X">
+		X
+	</string>
+	<string name="Y">
+		Y
+	</string>
+	<string name="Z">
+		Z
+	</string>
+	<string name="BeaconParticle">
+		Viser pejlelys for for partikler (blå)
+	</string>
+	<string name="BeaconPhysical">
+		Viser pejlelys for fysiske objekter (grøn)
+	</string>
+	<string name="BeaconScripted">
+		Viser pejlelys for &quot;scriptede&quot; objekter (rød)
+	</string>
+	<string name="BeaconScriptedTouch">
+		Viser pejlelys for &quot;scriptede&quot; objekter med berøringsfunktion (rød)
+	</string>
+	<string name="BeaconSound">
+		Viser pejlelys for lyd  (gul)
+	</string>
+	<string name="BeaconMedia">
+		Viser pejlelys for media (hvid)
+	</string>
+	<string name="ParticleHiding">
+		Skjuler partikler
+	</string>
 </strings>

indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml

      function="CheckControl"
      parameter="NearbyListShowIcons" />
   </menu_item_check>
+  <menu_item_check name ="view_map" label="View Map">
+    <menu_item_check.on_check
+      function="CheckControl"
+      parameter="NearbyListShowMap" />
+    <menu_item_check.on_click
+      function="ToggleControl"
+      parameter="NearbyListShowMap" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />

indra/newview/skins/default/xui/en/panel_cof_wearables.xml

              name="list_attachments"
              top="0"
              width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
         </accordion_tab>
         <accordion_tab
          layout="topleft"

indra/newview/skins/default/xui/en/panel_people.xml

      width="319">
      	<panel
          background_opaque="true"
-       background_visible="true"
+         background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
          name="nearby_panel"
          top="0"
          width="313">
-			<net_map
-			 bg_color="NetMapBackgroundColor"
-			 follows="top|left|right"
-			 layout="topleft"
-			 left="3"
-			 mouse_opaque="false"
-			 name="Net Map"
-			 width="305"
-			 height="140"
-			 top="5"/>
-			<avatar_list
-             allow_select="true"
-             follows="top|left|bottom|right"
-             height="211"
-             ignore_online_status="true"
+         <layout_stack
+           clip="false"
+           follows="all"
+           height="355"
+           layout="topleft"
+           mouse_opaque="false"
+           orientation="vertical"
+           width="313">
+           <layout_panel
+             height="142"
              layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             top="145"
-             width="306" />
-            <panel
+             mouse_opaque="false"
+             user_resize="false"
+             visibility_control="NearbyListShowMap"
+             width="313">
+             <net_map
+               bg_color="NetMapBackgroundColor"
+               follows="all"
+               height="140"
+               layout="topleft"
+               left="3"
+               mouse_opaque="false"
+               name="Net Map"
+               top="4"
+               width="305"/>
+           </layout_panel>
+           <layout_panel
+             height="213"
+             layout="topleft"
+             min_height="100"
+             mouse_opaque="false"
+             user_resize="false"
+             width="313">
+             <avatar_list
+               allow_select="true"
+               follows="all"
+               height="211"
+               ignore_online_status="true"
+               layout="topleft"
+               left="3"
+               keep_one_selected="false"
+               multi_select="true"
+               name="avatar_list"
+               top="2"
+               width="306" />
+           </layout_panel>
+         </layout_stack>
+         <panel
              background_visible="true"
              follows="left|right|bottom"
              height="27"

indra/newview/skins/default/xui/en/panel_preferences_sound.xml

          function="Pref.setControlFalse"
          parameter="MuteAmbient" />
     </slider>
-        <button
-    control_name="MuteAmbient"
+    <button
+     control_name="MuteAmbient"
      disabled_control="MuteAudio"
      follows="top|left"
      height="16"
          function="Pref.setControlFalse"
          parameter="MuteSounds" />
     </slider>
-   <button
+    <button
      control_name="MuteSounds"
      disabled_control="MuteAudio"
      follows="top|left"
      left_pad="5"
      name="mute_audio"
      tab_stop="false"
-     width="16" />
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
     <slider
      control_name="AudioLevelMusic"
      disabled_control="MuteAudio"
 		label="Play media attached to other avatars"
 		left="25"
     width="230"/>
-
+	<check_box
+		name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+        disabled_control="MuteAudio"
+		value="true"
+		follows="left|bottom|right"
+		height="15"
+		tool_tip="Check this to hear sounds from gestures"
+		label="Play sounds from gestures"
+		top_pad="1"
+		left="25"/>
     <text
      type="string"
      length="1"

indra/newview/skins/default/xui/en/strings.xml

 	<string name="InvFolder Friends">Friends</string>
 	<string name="InvFolder All">All</string>
 
+	<string name="no_attachments">No attachments worn</string>
+
 	<!-- inventory FVBridge -->
 	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Buy</string>

indra/newview/skins/default/xui/es/notifications.xml

 	<notification name="ImproperPaymentStatus">
 		No tienes el estado de pago adecuado para entrar a esta región.
 	</notification>
+	<notification name="MustGetAgeRgion">
+		Debes tener verificada la edad para entrar a esta región
+	</notification>
 	<notification name="MustGetAgeParcel">
 		Debes haber verificado tu edad para entrar a esta parcela.
 	</notification>

indra/newview/skins/default/xui/zh/floater_about.xml

 [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
 	<floater.string name="AboutSystem">
-		CPU: [CPU]
-Memory: [MEMORY_MB] MB
-OS Version: [OS_VERSION]
-Graphics Card Vendor: [GRAPHICS_CARD_VENDOR]
-Graphics Card: [GRAPHICS_CARD]
+		CPU:[CPU]
+記憶體:[MEMORY_MB] MB
+作業系統版本:[OS_VERSION]
+顯示卡供應商:[GRAPHICS_CARD_VENDOR]
+顯示卡:[GRAPHICS_CARD]
 	</floater.string>
 	<floater.string name="AboutDriver">
 		Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]

indra/newview/skins/default/xui/zh/floater_about_land.xml

 				0
 			</text>
 			<button label="購買土地" name="Buy Land..."/>
-			<button label="Script Info" name="Scripts..."/>
+			<button label="腳本資訊" name="Scripts..."/>
 			<button label="Buy For Group" name="Buy For Group..."/>
-			<button label="Buy Pass" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
-			<button label="Abandon Land" name="Abandon Land..."/>
+			<button label="購買通行權" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
+			<button label="放棄土地" name="Abandon Land..."/>
 			<button label="Reclaim Land" name="Reclaim Land..."/>
 			<button label="Linden Sale" name="Linden Sale..." tool_tip="Land must be owned, set content, and not already for auction."/>
 		</panel>
 				Land in this region may not be joined/subdivided.
 			</text>
 		</panel>
-		<panel label="OBJECTS" name="land_objects_panel">
+		<panel label="物件" name="land_objects_panel">
 			<panel.string name="objects_available_text">
 				[COUNT] out of [MAX] ([AVAILABLE] available)
 			</panel.string>
 			<text name="owner_objects_text">
 				[COUNT]
 			</text>
-			<button label="Show" label_selected="Show" name="ShowOwner"/>
-			<button label="Return" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
+			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
+			<button label="退回" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
 			<text name="Set to group:">
 				Set to group:
 			</text>
 			<text name="group_objects_text">
 				[COUNT]
 			</text>
-			<button label="Show" label_selected="Show" name="ShowGroup"/>
-			<button label="Return" name="ReturnGroup..." tool_tip="Return objects to their owners."/>
+			<button label="顯示" label_selected="顯示" name="ShowGroup"/>
+			<button label="退回" name="ReturnGroup..." tool_tip="Return objects to their owners."/>
 			<text name="Owned by others:">
 				Owned by others:
 			</text>
 			<text name="other_objects_text">
 				[COUNT]
 			</text>
-			<button label="Show" label_selected="Show" name="ShowOther"/>
-			<button label="Return" name="ReturnOther..." tool_tip="Return objects to their owners."/>
+			<button label="顯示" label_selected="顯示" name="ShowOther"/>
+			<button label="退回" name="ReturnOther..." tool_tip="Return objects to their owners."/>
 			<text name="Selected / sat upon:">
 				Selected / sat upon:
 			</text>
 				(無)
 			</panel.string>
 			<panel.string name="push_restrict_text">
-				No Pushing
+				禁止推撞
 			</panel.string>
 			<panel.string name="push_restrict_region_text">
-				No Pushing (Region Override)
+				禁止推撞(地區設定覆蓋)
 			</panel.string>
 			<text name="allow_label">
 				Allow other Residents to:
 			<text name="allow_label2">
 				建造:
 			</text>
-			<check_box label="Everyone" name="edit objects check"/>
+			<check_box label="任何人" name="edit objects check"/>
 			<check_box label="社團" name="edit group objects check"/>
 			<text name="allow_label3">
 				Object Entry:
 			</text>
-			<check_box label="Everyone" name="all object entry check"/>
+			<check_box label="任何人" name="all object entry check"/>
 			<check_box label="社團" name="group object entry check"/>
 			<text name="allow_label4">
 				Run Scripts:
 			</text>
-			<check_box label="Everyone" name="check other scripts"/>
+			<check_box label="任何人" name="check other scripts"/>
 			<check_box label="社團" name="check group scripts"/>
 			<text name="land_options_label">
 				Land Options:
 			</text>
-			<check_box label="Safe (no damage)" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."/>
-			<check_box label="No Pushing" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."/>
-			<check_box label="Show Place in Search (L$30/week)" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
+			<check_box label="安全(無傷害)" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."/>
+			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."/>
+			<check_box label="將地點刊登顯示在搜尋中(L$30 / 每週)" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
 			<combo_box name="land category with adult">
-				<combo_box.item label="Any Category" name="item0"/>
+				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
 				<combo_box.item label="Adult" name="item2"/>
 				<combo_box.item label="Arts &amp; Culture" name="item3"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
-				<combo_box.item label="Any Category" name="item0"/>
+				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
 				<combo_box.item label="Arts &amp; Culture" name="item3"/>
 				<combo_box.item label="Business" name="item4"/>
 			</combo_box>
 			<check_box label="Moderate Content" name="MatureCheck" tool_tip=" "/>
 			<text name="Snapshot:">
-				Snapshot:
+				快照:
 			</text>
 			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑選圖片"/>
 			<text name="landing_point">
-				Landing Point: [LANDING]
+				登陸點:[LANDING]
 			</text>
 			<button label="設定" label_selected="設定" name="Set" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."/>
 			<button label="清除" label_selected="清除" name="Clear" tool_tip="清除登陸點"/>
 			<spinner name="media_size_width" tool_tip="Size to render Web media, leave 0 for default."/>
 			<spinner name="media_size_height" tool_tip="Size to render Web media, leave 0 for default."/>
 			<text name="pixels">
-				pixels
+				像素
 			</text>
 			<text name="Options:">
 				Options:
 					Banned Residents
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
-				<button label="Add" name="add_banned"/>
-				<button label="Remove" label_selected="Remove" name="remove_banned"/>
+				<button label="添加" name="add_banned"/>
+				<button label="移除" label_selected="移除" name="remove_banned"/>
 			</panel>
 		</panel>
 	</tab_container>

indra/newview/skins/default/xui/zh/floater_animation_preview.xml

 We recommend BVH files exported from Poser 4.
 	</text>
 	<button label="上傳(L$[AMOUNT])" name="ok_btn"/>
-	<button label="取" name="cancel_btn"/>
+	<button label="取" name="cancel_btn"/>
 </floater>

indra/newview/skins/default/xui/zh/floater_avatar_picker.xml

 		No results
 	</floater.string>
 	<floater.string name="searching">
-		Searching...
+		搜尋中...
 	</floater.string>
 	<string name="Select">
-		Select
+		選擇
 	</string>
 	<string name="Close">
 		關閉
 	</string>
 	<tab_container name="ResidentChooserTabs">
-		<panel label="Search" name="SearchPanel">
+		<panel label="搜尋" name="SearchPanel">
 			<text name="InstructSearchResidentName">
 				Type part of a person&apos;s name:
 			</text>
 			<button label="Go" label_selected="Go" name="Find"/>
 			<scroll_list name="SearchResults">
 				<columns label="名稱" name="name"/>
-				<columns label="Username" name="username"/>
+				<columns label="使用者名稱" name="username"/>
 			</scroll_list>
 		</panel>
 		<panel label="Friends" name="FriendsPanel">
 			</text>
 			<scroll_list name="NearMe">
 				<columns label="名稱" name="name"/>
-				<columns label="Username" name="username"/>
+				<columns label="使用者名稱" name="username"/>
 			</scroll_list>
 		</panel>
 	</tab_container>
 	<button label="確定" label_selected="確定" name="ok_btn"/>
-	<button label="取" label_selected="取" name="cancel_btn"/>
+	<button label="取" label_selected="取" name="cancel_btn"/>
 </floater>

indra/newview/skins/default/xui/zh/floater_bulk_perms.xml

 	<floater.string name="done_text">
 		Finished permission change requests.
 	</floater.string>
-	<icon name="icon_animation" tool_tip="Animation"/>
+	<icon name="icon_animation" tool_tip="動作"/>
 	<icon name="icon_bodypart" tool_tip="身體部位"/>
 	<icon name="icon_clothing" tool_tip="服裝"/>
 	<icon name="icon_gesture" tool_tip="姿勢"/>
-	<icon name="icon_notecard" tool_tip="Notecards"/>
-	<icon name="icon_object" tool_tip="Objects"/>
-	<icon name="icon_script" tool_tip="Scripts"/>
-	<icon name="icon_sound" tool_tip="Sounds"/>
+	<icon name="icon_notecard" tool_tip="記事卡"/>
+	<icon name="icon_object" tool_tip="物件"/>
+	<icon name="icon_script" tool_tip="腳本"/>
+	<icon name="icon_sound" tool_tip="聲音"/>
 	<icon name="icon_texture" tool_tip="材質"/>
 	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
 	<check_box label="覆製" name="next_owner_copy"/>
 	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="Next owner can give away or resell this object"/>
 	<button label="確定" name="apply"/>
-	<button label="取" name="close"/>
+	<button label="取" name="close"/>
 </floater>

indra/newview/skins/default/xui/zh/floater_buy_contents.xml

 	</text>
 	<check_box label="立即穿上服裝" name="wear_check"/>
 	<button label="購買" label_selected="購買" name="buy_btn"/>
-	<button label="取" label_selected="取" name="cancel_btn"/>
+	<button label="取" label_selected="取" name="cancel_btn"/>
 </floater>

indra/newview/skins/default/xui/zh/floater_buy_currency.xml

 		You aren&apos;t buying enough L$. Please increase the amount.
 	</text>
 	<button label="立即購買" name="buy_btn"/>
-	<button label="取" name="cancel_btn"/>
+	<button label="取" name="cancel_btn"/>
 	<text name="info_cannot_buy">
 		Unable to Buy
 	</text>