diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index f5e9cdc7e4..640c55c988 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -358,10 +358,13 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs)
     return new_foo;
 }
 
-inline F32 lerp(F32 a, F32 b, F32 u)
-{
-    return a + ((b - a) * u);
-}
+// <FS:Ansariel> std::lerp fix from previous develop branch
+//inline F32 lerp(F32 a, F32 b, F32 u)
+//{
+//    return a + ((b - a) * u);
+//}
+using std::lerp;
+// </FS:Ansariel>
 
 inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v)
 {
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 884d90158b..c1249c64bb 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1311,9 +1311,9 @@ void LLPath::genNGon(const LLPathParams& params, S32 sides, F32 startOff, F32 en
     c       = cos(ang)*lerp(radius_start, radius_end, t);
 
 
-    pt->mPos.set(0 + lerp(0,params.getShear().mV[0],s)
+    pt->mPos.set(0 + lerp(0.f,params.getShear().mV[0],s)
                       + lerp(-skew ,skew, t) * 0.5f,
-                    c + lerp(0,params.getShear().mV[1],s),
+                    c + lerp(0.f,params.getShear().mV[1],s),
                     s);
     pt->mScale.set(hole_x * lerp(taper_x_begin, taper_x_end, t),
         hole_y * lerp(taper_y_begin, taper_y_end, t),
@@ -1344,9 +1344,9 @@ void LLPath::genNGon(const LLPathParams& params, S32 sides, F32 startOff, F32 en
         c   = cos(ang)*lerp(radius_start, radius_end, t);
         s   = sin(ang)*lerp(radius_start, radius_end, t);
 
-        pt->mPos.set(0 + lerp(0,params.getShear().mV[0],s)
+        pt->mPos.set(0 + lerp(0.f,params.getShear().mV[0],s)
                           + lerp(-skew ,skew, t) * 0.5f,
-                        c + lerp(0,params.getShear().mV[1],s),
+                        c + lerp(0.f,params.getShear().mV[1],s),
                         s);
 
         pt->mScale.set(hole_x * lerp(taper_x_begin, taper_x_end, t),
@@ -1371,9 +1371,9 @@ void LLPath::genNGon(const LLPathParams& params, S32 sides, F32 startOff, F32 en
     c   = cos(ang)*lerp(radius_start, radius_end, t);
     s   = sin(ang)*lerp(radius_start, radius_end, t);
 
-    pt->mPos.set(0 + lerp(0,params.getShear().mV[0],s)
+    pt->mPos.set(0 + lerp(0.f,params.getShear().mV[0],s)
                       + lerp(-skew ,skew, t) * 0.5f,
-                    c + lerp(0,params.getShear().mV[1],s),
+                    c + lerp(0.f,params.getShear().mV[1],s),
                     s);
     pt->mScale.set(hole_x * lerp(taper_x_begin, taper_x_end, t),
                    hole_y * lerp(taper_y_begin, taper_y_end, t),
@@ -1511,8 +1511,8 @@ bool LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
             for (S32 i=0;i<np;i++)
             {
                 F32 t = lerp(params.getBegin(),params.getEnd(),(F32)i * mStep);
-                mPath[i].mPos.set(lerp(0,params.getShear().mV[0],t),
-                                     lerp(0,params.getShear().mV[1],t),
+                mPath[i].mPos.set(lerp(0.f,params.getShear().mV[0],t),
+                                     lerp(0.f,params.getShear().mV[1],t),
                                      t - 0.5f);
                 LLQuaternion quat;
                 quat.setQuat(lerp(F_PI * params.getTwistBegin(),F_PI * params.getTwist(),t),0,0,1);
@@ -1576,10 +1576,10 @@ bool LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
         {
             F32 t = (F32)i * mStep;
             mPath[i].mPos.set(0,
-                                lerp(0,   -sin(F_PI*params.getTwist()*t)*0.5f,t),
+                                lerp(0.f,   -sin(F_PI*params.getTwist()*t)*0.5f,t),
                                 lerp(-0.5f, cos(F_PI*params.getTwist()*t)*0.5f,t));
-            mPath[i].mScale.set(lerp(1,params.getScale().mV[0],t),
-                                lerp(1,params.getScale().mV[1],t), 0,1);
+            mPath[i].mScale.set(lerp(1.f,params.getScale().mV[0],t),
+                                lerp(1.f,params.getScale().mV[1],t), 0.f,1.f);
             mPath[i].mTexT  = t;
             LLQuaternion quat;
             quat.setQuat(F_PI * params.getTwist() * t,1,0,0);
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 4de1b06cbd..249a4361fc 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -779,7 +779,7 @@ void LLPanelPrimMediaControls::draw()
     else if(mFadeTimer.getStarted())
     {
         F32 time = mFadeTimer.getElapsedTimeF32();
-        alpha *= llmax(lerp(1.0, 0.0, time / mControlFadeTime), 0.0f);
+        alpha *= llmax(lerp(1.0f, 0.0f, time / mControlFadeTime), 0.0f);
 
         if(time >= mControlFadeTime)
         {
diff --git a/indra/newview/skins/default/xui/az/panel_progress.xml b/indra/newview/skins/default/xui/az/panel_progress.xml
index f356bd391b..4198e7f03b 100644
--- a/indra/newview/skins/default/xui/az/panel_progress.xml
+++ b/indra/newview/skins/default/xui/az/panel_progress.xml
@@ -2,12 +2,12 @@
 <panel name="login_progress_panel">
   <layout_stack name="horizontal_centering">
     <layout_panel name="center">
-      <layout_stack name="vertical_centering">
+      <layout_stack name="vertical_centering1">
         <layout_panel name="panel4">
-          <layout_stack name="vertical_centering">
+          <layout_stack name="vertical_centering2">
             <layout_panel name="panel_icons">
               <text name="logos_lbl">
-                [APP_NAME] istifadə edir:
+                Second Life istifadə edir:
               </text>
             </layout_panel>
           </layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_progress.xml b/indra/newview/skins/default/xui/de/panel_progress.xml
index b20aeb33de..c6a709803b 100644
--- a/indra/newview/skins/default/xui/de/panel_progress.xml
+++ b/indra/newview/skins/default/xui/de/panel_progress.xml
@@ -5,14 +5,9 @@
 			<layout_stack name="vertical_centering1">
 				<layout_panel name="panel4">
 					<layout_stack name="vertical_centering2">
-						<layout_panel name="panel_login">
-							<text name="login_text">
-								Anmeldung...
-							</text>
-						</layout_panel>
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
-								[APP_NAME] verwendet
+								Second Life verwendet
 							</text>
 						</layout_panel>
 					</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/panel_progress.xml b/indra/newview/skins/default/xui/es/panel_progress.xml
index c9bed9fd9b..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/es/panel_progress.xml
+++ b/indra/newview/skins/default/xui/es/panel_progress.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_progress.xml b/indra/newview/skins/default/xui/fr/panel_progress.xml
index 1f125c1007..9b20750f0f 100644
--- a/indra/newview/skins/default/xui/fr/panel_progress.xml
+++ b/indra/newview/skins/default/xui/fr/panel_progress.xml
@@ -7,7 +7,7 @@
 					<layout_stack name="vertical_centering2">
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
-								[APP_NAME] utilise
+								Second Life utilise
 							</text>
 						</layout_panel>
 					</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_progress.xml b/indra/newview/skins/default/xui/it/panel_progress.xml
index c9bed9fd9b..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/it/panel_progress.xml
+++ b/indra/newview/skins/default/xui/it/panel_progress.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_progress.xml b/indra/newview/skins/default/xui/ja/panel_progress.xml
index aad0ef6ded..77404e29cf 100644
--- a/indra/newview/skins/default/xui/ja/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ja/panel_progress.xml
@@ -2,9 +2,9 @@
 <panel name="login_progress_panel">
 	<layout_stack name="horizontal_centering">
 		<layout_panel name="center">
-			<layout_stack name="vertical_centering">
+			<layout_stack name="vertical_centering1">
 				<layout_panel name="panel4">
-					<layout_stack name="vertical_centering">
+					<layout_stack name="vertical_centering2">
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
 								[APP_NAME]で使用：
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
index 2a5ee34cb8..af5274e143 100644
--- a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
@@ -10,6 +10,10 @@
 		Niska
 	</text>
 	<slider label="Maks. świateł:" name="MaxLights" />
+	<text name="MaxTextureResolutionLabel">
+		Maks. rozdzielcz. LOD:
+	</text>
+	<combo_box name="MaxTextureResolution" tool_tip="Maksymalna rozdzielczość 'poziomu szczegółowości' tekstur" />
 	<check_box label="Włącz VSync" name="vsync" tool_tip="Synchronizuje liczbę klatek na sekundę z częstotliwością odświeżania monitora, może skutkować zmniejszeniem widocznej płynności i opóźnieniami." />
 	<text name="AvatarText">
 		Awatar
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index c16d99f4b2..93d5df8961 100644
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -14,7 +14,6 @@
 		<menu_item_call label="Wiki Second Life" name="Wiki"/>
 		<menu_item_call label="Forum społecznościowe" name="Community Forums"/>
 		<menu_item_call label="Portal wsparcia" name="Support portal"/>
-		<menu_item_call label="Newsy: [SECOND_LIFE]" name="Second Life News"/>
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
 		<menu_item_call label="Zgłoś problem" name="Report Bug"/>
 		<menu_item_call label="Informacje o [APP_NAME]" name="About Second Life"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e853e86930..0ce2db7c70 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -297,7 +297,6 @@
 		<menu_item_call label="Wiki informacyjna" name="Wiki"/>
 		<menu_item_call label="Forum społecznościowe" name="Community Forums"/>
 		<menu_item_call label="Portal wsparcia" name="Support portal"/>
-		<menu_item_call label="Newsy: [SECOND_LIFE]" name="Second Life News"/>
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
 		<menu_item_call name="whitelist_folders" label="Doradca wykluczeń" />
 		<menu_item_check label="Sprawdź stan świata" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index 97e2cb58f8..1fa08b4950 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -169,15 +169,14 @@
 				Rendering tekstur:
 			</text>
 			<!-- Removed in FIRE-24256, leaving it here for non-SL viewer version --> <check_box label="Pobieraj tekstury przez HTTP" tool_tip="Zaznacz tę opcję, aby ściągać tekstury poprzez protokół HTTP - odznacz ją, jeśli masz problemy z wyświetlaniem i chcesz wczytywać tekstury w taki sam sposób, jak przed lipcem 2010: na Viewerze 1." name="TexturesHTTP" />
-			<check_box width="270" label="Ogranicz maksymalną rozdzielczość tekstur do:" tool_tip="Zaznacz tą opcję, aby ograniczyć maksymalną rozdzielczość tekstur w świecie. Pozwala to na wyświetlanie większej ilości tekstur zanim dostępna na nie pamięć zostanie przekroczona i zaczną się one rozmywać." name="FSRestrictMaxTextureSize" />
-			<combo_box name="FSRestrictMaxTexturePixels">
+			<text name="FSRestrictMaxTextureSize">
+				Ogranicz maks. rozdzielczość tekstur do:
+			</text>
+			<combo_box name="FSRestrictMaxTexturePixels" tool_tip="Ustawia maksymalną rozdzielczość wyświetlania tekstur wewnątrz świata. Pozwala to na wyświetlenie większej ich ilości przed przekroczeniem dostępnej pamięci i zauważaniem ich rozmywania.">
 				<combo_box.item label="512 pikseli" name="512" />
 				<combo_box.item label="1024 pikseli" name="1024" />
 				<combo_box.item label="2048 pikseli" name="2048" />
 			</combo_box>
-			<text name="FSRestrictMaxTextureSizeRestartText">
-				(wymagany restart)
-			</text>
 			<text name="TextureDetailLabel">
 				Maks. jakość tekstur:
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_progress.xml b/indra/newview/skins/default/xui/pt/panel_progress.xml
index c9bed9fd9b..597d55cc4b 100644
--- a/indra/newview/skins/default/xui/pt/panel_progress.xml
+++ b/indra/newview/skins/default/xui/pt/panel_progress.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" ?>
 <panel name="login_progress_panel">
-	<layout_stack name="vertical_centering"/>
-	<layout_panel name="panel4"/>
-	<layout_panel name="center"/>
 	<layout_stack name="horizontal_centering">
+		<layout_panel name="center">
+			<layout_stack name="vertical_centering1">
+				<layout_panel name="panel4">
+					<layout_stack name="vertical_centering2">
+						<layout_panel name="panel_icons">
+							<!-- <text name="logos_lbl">
+								Second Life uses
+							</text> -->
+						</layout_panel>
+					</layout_stack>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
index f4292f5662..0a6970d55f 100644
--- a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
@@ -12,6 +12,10 @@
 	<text name="PostProcessText">
 		Низкое
 	</text>
+	<text name="MaxTextureResolutionLabel">
+		Макс. разрешение LOD:
+	</text>
+	<combo_box name="MaxTextureResolution" tool_tip="Максимальное разрешение для текстур с'высоким уровнем детализации'"/>
 	<slider label="Макс. источн.света рядом:" label_width="185" name="MaxLights" width="336" />
 	<check_box label="Включить VSync" name="vsync" tool_tip="Синхронизирует частоту кадров с частотой обновления монитора, что обеспечивает плавную работу."/>
 	<text name="AvatarText">
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 34753ed2bc..98a5021357 100644
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -10,13 +10,13 @@
 		<menu_item_call label="Firestorm Wiki" name="Firestorm Wiki"/>
 		<menu_item_call label="Решение проблем" name="Troubleshooting"/>
 		<menu_item_call label="Обучение" name="How To"/>
-		<!-- <menu_item_call label="Быстрый старт" name="Quickstart"/>
+		<!--
 		<menu_item_call label="База знаний" name="Knowledge Base"/>
 		<menu_item_call label="Wiki Second Life" name="Wiki"/>
 		<menu_item_call label="Forum сообщества" name="Community Forums"/>
 		<menu_item_call label="Портал поддержки" name="Support portal"/>
-		<menu_item_call label="Новости: [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Блоги: [SECOND_LIFE]" name="Second Life Blogs"/> -->
+		<menu_item_call label="Блоги: [SECOND_LIFE]" name="Second Life Blogs"/>
+		 -->
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="Информация о [APP_NAME]" name="About Second Life"/>
 		<menu_item_call label="Помощь для [CURRENT_GRID]" name="current_grid_help_login"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index c89c123943..5bdd1b7665 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -334,7 +334,6 @@
 		<menu_item_call label="Wiki" name="Wiki"/>
 		<menu_item_call label="Community Forums" name="Community Forums"/>
 		<menu_item_call label="Support portal" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] News" name="Second Life News"/>
 		<menu_item_call label="[SECOND_LIFE] Blogs" name="Second Life Blogs"/> -->
 		<menu_item_call name="whitelist_folders" label="Советник Белого Списка"/>
 		<menu_item_call label="Проверка статуса сети (Grid Status)" name="Grid Status"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_progress.xml b/indra/newview/skins/default/xui/ru/panel_progress.xml
index 314d795307..ed43e1107b 100644
--- a/indra/newview/skins/default/xui/ru/panel_progress.xml
+++ b/indra/newview/skins/default/xui/ru/panel_progress.xml
@@ -2,12 +2,12 @@
 <panel name="login_progress_panel">
   <layout_stack name="horizontal_centering">
     <layout_panel name="center">
-      <layout_stack name="vertical_centering">
+      <layout_stack name="vertical_centering1">
         <layout_panel name="panel4">
-          <layout_stack name="vertical_centering">
+          <layout_stack name="vertical_centering2">
             <layout_panel name="panel_icons">
               <text name="logos_lbl">
-                [APP_NAME] использует
+                Вторая Жизнь использует
               </text>
             </layout_panel>
           </layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
index a62c13bfa9..6c0db81c63 100644
--- a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
@@ -22,4 +22,8 @@
 	<text name="wait_text">
 		Подождите
 	</text>
+	<text name="disabled_text">
+		Отключен
+	</text>
+	<button name="unmute_btn" label="Включить"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
index c2d1aa1835..4230a87c86 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -13,6 +13,10 @@
 		低
 	</text>
 	<slider label="最大鄰近光源數：" name="MaxLights" />
+	<text name="MaxTextureResolutionLabel">
+		最大細節層次解析度：
+	</text>
+	<combo_box name="MaxTextureResolution" tool_tip="“細節層次(LOD)”紋理的最大解析度"/>
 	<check_box label="啟用垂直同步" tool_tip="將影格速率與顯示器的更新率同步，可能會導致更多的卡頓和輸入延遲。" name="vsync" />
 	<text name="AvatarText">
 		化身
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index b5b08f13d8..1908359541 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -294,15 +294,15 @@
 			<text name="label position">
 				位置（米）
 			</text>
-			<button name="copy_rot_btn" tool_tip="複製旋轉" />
-			<button name="paste_rot_btn" tool_tip="貼上旋轉" />
-			<button name="paste_rot_clip_btn" tool_tip="嘗試從剪貼簿貼上旋轉" />
+			<button name="copy_pos_btn" tool_tip="複製旋轉" />
+			<button name="paste_pos_btn" tool_tip="貼上旋轉" />
+			<button name="paste_pos_clip_btn" tool_tip="嘗試從剪貼簿貼上旋轉" />
 			<text name="label size">
 				尺寸（米）
 			</text>
-			<button name="copy_rot_btn" tool_tip="複製尺寸" />
-			<button name="paste_rot_btn" tool_tip="貼上尺寸" />
-			<button name="paste_rot_clip_btn" tool_tip="嘗試從剪貼簿貼上尺寸" />
+			<button name="copy_size_btn" tool_tip="複製尺寸" />
+			<button name="paste_size_btn" tool_tip="貼上尺寸" />
+			<button name="paste_size_clip_btn" tool_tip="嘗試從剪貼簿貼上尺寸" />
 			<text name="label rotation">
 				旋轉（角度）
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index e75f726f0a..2f519bafc0 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -168,20 +168,18 @@
 			<check_box label="暫停世界更新 (使所有內容暫停)" tool_tip="勾選此項可暫停來自世界的所有更新- 這將暫停所有視覺操作，但不會影響書面或語音聊天" name="WorldPause" />
 			<check_box label="限制影格率" name="FSLimitFramerate" />
 			<slider label="FPS：" name="MaxFPS" />
-			<check_box label="啟用垂直同步" name="vsync" tool_tip="將影格速率與顯示器更新率同步，可能會導致延遲增加和圖像卡頓。" />
+			<check_box label="將影格率限制為顯示器頻率（垂直同步）" name="vsync" tool_tip="將影格速率與顯示器更新率同步，可能會導致延遲增加和圖像卡頓。" />
 			<text name="Texture Rendering">紋理彩現：</text>
 			<check_box label="載入最小紋理" tool_tip="設定「紋理禁用」參數-紋理載入速度極慢，可能對GPU較慢的電腦有用" name="TexturesLoaded" />
 			<check_box label="使用HTTP載入紋理" tool_tip="啟用通過HTTP協定載入紋理-如果出現紋理載入緩慢或不正確的問題，並且要使用過時的UDP協定，則禁用此選項。" name="TexturesHTTP" />
-			<check_box label="將紋理的最大解析度限制為：（需要重新啟動）" tool_tip="將紋理的最大解析度限制為指定的畫素。這允許在現有紋理記憶體用盡之前顯示多個紋理，並且不會顯示模糊的紋理。" name="FSRestrictMaxTextureSize" />
-			<combo_box name="FSRestrictMaxTexturePixels">
+			<text name="FSRestrictMaxTextureSize">
+				將紋理的最大解析度限制為：
+			</text>
+			<combo_box name="FSRestrictMaxTexturePixels" tool_tip="將紋理的最大解析度限制為指定的畫素。這允許在現有紋理記憶體用盡之前顯示多個紋理，並且不會顯示模糊的紋理。">
 				<combo_box.item label="512畫素" name="512" />
 				<combo_box.item label="1024畫素" name="1024" />
-				<!-- 2048 is the current maximum, so this only becomes important if we get 4096 pixel textures
-				<combo_box.item label="2048畫素" name="2048"/>-->
+				<combo_box.item label="2048畫素" name="2048"/>
 			</combo_box>
-			<text name="FSRestrictMaxTextureSizeRestartText">
-				(需要重新啟動)
-			</text>
 			<slider label="最大同時HTTP請求數" name="HTTPFetchMaxRequests" />
 			<text name="TextureDetailLabel" tool_tip="載入紋理的品質級別。影響紋理丟棄設定">
 				最大紋理品質：
diff --git a/indra/newview/skins/default/xui/zh/panel_progress.xml b/indra/newview/skins/default/xui/zh/panel_progress.xml
index 5799def95b..a925df6e98 100644
--- a/indra/newview/skins/default/xui/zh/panel_progress.xml
+++ b/indra/newview/skins/default/xui/zh/panel_progress.xml
@@ -2,17 +2,12 @@
 <panel name="login_progress_panel">
 	<layout_stack name="horizontal_centering">
 		<layout_panel name="center">
-			<layout_stack name="vertical_centering">
+			<layout_stack name="vertical_centering1">
 				<layout_panel name="panel4">
-					<layout_stack name="vertical_centering">
-						<layout_panel name="panel_login">
-							<text name="login_text">
-								正在登入...
-							</text>
-						</layout_panel>
+					<layout_stack name="vertical_centering2">
 						<layout_panel name="panel_icons">
 							<text name="logos_lbl">
-								[APP_NAME] 正在使用
+								正在使用Second Life
 							</text>
 						</layout_panel>
 					</layout_stack>