diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index 68118b7d57..9f8e0f5bc9 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -43,10 +43,13 @@
 
     <!-- Inventory -->
     <panel label="Inventar" name="tab-inventory">
-	<check_box label="Benachrichtigen, wenn ich beim Hochladen Geld bezahlen muss" name="FSShowUploadPaymentToast"/>
-	<check_box label="Benachrichtigen, wenn eine Landmarke erstellt wurde" name="landmark_created_checkbox"/>
-	<check_box label="Objekt-Rückgabe-Benachrichtung deaktivieren" name="FSDisableReturnObjectNotification"/>
-	<check_box label="Dateinamen von gespeicherten Schnappschüssen im Chat in der Nähe protokollieren" name="FSLogSnapshotsToLocal"/>
+		<check_box label="Benachrichtigen, wenn ich beim Hochladen Geld bezahlen muss" name="FSShowUploadPaymentToast"/>
+		<check_box label="Benachrichtigen, wenn eine Landmarke erstellt wurde" name="landmark_created_checkbox"/>
+		<check_box label="Objekt-Rückgabe-Benachrichtung deaktivieren" name="FSDisableReturnObjectNotification"/>
+		<check_box label="Dateinamen von gespeicherten Schnappschüssen im Chat in der Nähe protokollieren" name="FSLogSnapshotsToLocal"/>
+		<check_box label="Benachrichtigen, falls Objekte zu schnell eintreffen" name="FSNotifyIncomingObjectSpam"/>
+		<check_box label="Benachrichtigen, falls Objekte von anderen Einwohnern zu schnell eintreffen" name="FSNotifyIncomingObjectSpamFrom"/>
+		<slider name="FSOfferThrottleMaxCount" label="Schwellwert für zu schnell eintreffende Objekte:" label_width="260" width="385" tool_tip="Setzt den Schwellwert für die Anzahl an eintreffenden Objekten innerhalb von 10 Sekunden, ab dem eine Drosselung einsetzt. Standardwert: 5"/>
     </panel>
 
     <!-- Alerts -->
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
index b7490a9b06..7106d573a9 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -76,9 +76,6 @@
 		<button name="AntiSpamUnblock" label="Alle blockierten Spam-Quellen freigeben" width="250"/>
 
 		<check_box label="„Beitreten“-Button von Gruppeneinladungen entfernen, falls Beitritt nicht kostenlos" name="FSAllowGroupInvitationOnlyWithoutFee"/>
-		<check_box label="Benachrichtigen, falls Objekte zu schnell eintreffen" name="FSNotifyIncomingObjectSpam"/>
-		<check_box label="Benachrichtigen, falls Objekte von anderen Einwohnern zu schnell eintreffen" name="FSNotifyIncomingObjectSpamFrom"/>
-		<slider name="FSOfferThrottleMaxCount" label="Schwellwert für zu schnell eintreffende Objekte:" label_width="260" width="385" tool_tip="Setzt den Schwellwert für die Anzahl an eintreffenden Objekten innerhalb von 10 Sekunden, ab dem eine Drosselung einsetzt. Standardwert: 5"/>
 	</panel>
 
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 9abcb8c5a7..4e211f9127 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -340,8 +340,43 @@
      layout="topleft"
      name="FSLogSnapshotsToLocal"
      top_pad="3" />
-
-	</panel>
+    <check_box
+     top_pad="3"
+     left="10"
+     label="Notify about items from objects coming in too fast"
+     control_name="FSNotifyIncomingObjectSpam"
+     follows="left|top"
+     height="16"
+     name="FSNotifyIncomingObjectSpam"
+     width="200" />
+    <check_box
+     top_pad="3"
+     left="10"
+     label="Notify about items from other residents coming in too fast"
+     control_name="FSNotifyIncomingObjectSpamFrom"
+     follows="left|top"
+     height="16"
+     name="FSNotifyIncomingObjectSpamFrom"
+     width="200" />
+    <slider
+     left="10"
+     top_pad="3"
+     name="FSOfferThrottleMaxCount"
+     control_name="FSOfferThrottleMaxCount"
+     decimal_digits="0"
+     enabled="true"
+     follows="left|top"
+     height="18"
+     increment="1"
+     initial_value="5"
+     label="Incoming object offers throttle threshold:"
+     label_width="225"
+     max_val="20"
+     min_val="1"
+     show_text="true"
+     width="350"
+     tool_tip="Sets the threshold of incoming object offers within 10 seconds before they get throttled. Default 5" />
+    </panel>
 
     <!-- Alerts -->
     <panel
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index f7595652c6..2e7bd69c72 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -441,42 +441,6 @@
          height="16"
          name="FSAllowGroupInvitationOnlyWithoutFee"
          width="200" />
-        <check_box
-         top_pad="2"
-         left="10"
-         label="Notify about items from objects coming in too fast"
-         control_name="FSNotifyIncomingObjectSpam"
-         follows="left|top"
-         height="16"
-         name="FSNotifyIncomingObjectSpam"
-         width="200" />
-        <check_box
-         top_pad="2"
-         left="10"
-         label="Notify about items from other residents coming in too fast"
-         control_name="FSNotifyIncomingObjectSpamFrom"
-         follows="left|top"
-         height="16"
-         name="FSNotifyIncomingObjectSpamFrom"
-         width="200" />
-        <slider
-         left="10"
-         top_pad="3"
-         name="FSOfferThrottleMaxCount"
-         control_name="FSOfferThrottleMaxCount"
-         decimal_digits="0"
-         enabled="true"
-         follows="left|top"
-         height="18"
-         increment="1"
-         initial_value="5"
-         label="Incoming object offers throttle threshold:"
-         label_width="225"
-         max_val="20"
-         min_val="1"
-         show_text="true"
-         width="350"
-         tool_tip="Sets the threshold of incoming object offers within 10 seconds before they get throttled. Default 5" />
 	</panel>
 
 
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
index d82535b191..3e55157183 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
@@ -43,6 +43,9 @@
 	<check_box name="FSShowUploadPaymentToast" label="Avisarme: Cuando se me cobra por una subida"/>
 	<check_box label="Avisarme: Cuando se cree un hito" name="landmark_created_checkbox"/>
 	<check_box label="Desactivar notificaciones de 'el objeto ha sido devuelto a tu inventario'" name="FSDisableReturnObjectNotification"/>
+	<check_box label="Notificar cuando se reciben items demasiado rápido" name="FSNotifyIncomingObjectSpam"/>
+	<check_box label="Notificar cuando se reciben items de otros residentes demasiado rápido" name="FSNotifyIncomingObjectSpamFrom"/>
+	<slider name="FSOfferThrottleMaxCount" label="Umbral para acelerar la entrada de items:" tool_tip="Establece el umbral de ofertas de items entrantes en un intérvalo de 10 segundos para que se produzca la aceleración de la entrada. Por defecto, 5." label_width="235" width="360"/>
     </panel>
 
     <!-- Alerts -->
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml
index 19cf7d2dec..cad6e5e405 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml
@@ -52,9 +52,6 @@
 			<spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="Multiplicador de eventos para peticiones de precarga de sonido [Por defecto: 4]"/>
 			<button name="AntiSpamUnblock" label="Desbloquear todas las fuentes de spam" width="250"/>
 			<check_box label="Eliminar el botón &quot;Entrar&quot; de las invitaciones de grupo cuando éstas tengan coste" name="FSAllowGroupInvitationOnlyWithoutFee"/>
-			<check_box label="Notificar cuando se reciben items demasiado rápido" name="FSNotifyIncomingObjectSpam"/>
-			<check_box label="Notificar cuando se reciben items de otros residentes demasiado rápido" name="FSNotifyIncomingObjectSpamFrom"/>
-			<slider name="FSOfferThrottleMaxCount" label="Umbral para acelerar la entrada de items:" tool_tip="Establece el umbral de ofertas de items entrantes en un intérvalo de 10 segundos para que se produzca la aceleración de la entrada. Por defecto, 5." label_width="235" width="360"/>
 		</panel>
 		<panel label="Avatar" name="firestorm_avatar">
 			<text name="HeadMovement">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
index fc51563a93..0356f24392 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
@@ -7,6 +7,16 @@
 	<check_box label="Me prévenir: Quand je dépense ou que je reçois des L$" name="notify_money_change_checkbox"/>
     </panel>
 
+	<panel name="tab-inventory">
+        <check_box name="FSNotifyIncomingObjectSpam"
+			label="Notifier lors du blocage d'items arrivant trop vite via un objet"/>
+        <check_box name="FSNotifyIncomingObjectSpamFrom"
+			label="Notifier lors du blocage d'items arrivant trop vite via un résident"/>
+        <slider name="FSOfferThrottleMaxCount"
+			label="Seuil d'offres, sur 10 sec, des objets :"
+			tool_tip="Défini, sur 10 secondes, le seuil d'offres entrantes successives émanant des objets avant qu'elles ne soient étranglées. [Défaut : 5]"/>
+	</panel>
+
     <!-- Alerts -->
     <panel label="Alerts" name="tab-alerts">
 	<text name="show_label">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
index 87a7718760..b18d57f43e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
@@ -95,14 +95,6 @@
 			tool_tip="Nombre maximum de demandes successives à précharger un son. [Défaut : 4]"/>
         <button name="AntiSpamUnblock"
 			label="Débloquer toutes les sources"/>
-	<!--spec-->
-        <check_box name="FSNotifyIncomingObjectSpam"
-			label="Notifier lors du blocage d'items arrivant trop vite via un objet"/>
-        <check_box name="FSNotifyIncomingObjectSpamFrom"
-			label="Notifier lors du blocage d'items arrivant trop vite via un résident"/>
-        <slider name="FSOfferThrottleMaxCount"
-			label="Seuil d'offres, sur 10 sec, des objets :"
-			tool_tip="Défini, sur 10 secondes, le seuil d'offres entrantes successives émanant des objets avant qu'elles ne soient étranglées. [Défaut : 5]"/>
 	</panel>
 
 <!--Avatar-->
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
index 69eaf195dc..0164872282 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
@@ -33,6 +33,9 @@
     <!-- Inventory -->
     <panel label="Inventario" name="tab-inventory">
 	<check_box label="Avvisami: Quando viene creato un Landmark" name="landmark_created_checkbox"/>
+	<check_box label="Notifica quando gli oggetti arrivano troppo velocemente" name="FSNotifyIncomingObjectSpam" />
+	<check_box label="Notifica quando un'altro residente ti invia oggetti troppo velocemente" name="FSNotifyIncomingObjectSpamFrom" />
+	<slider name="FSOfferThrottleMaxCount" label="Limita soglia degli oggetti che arrivano:" tool_tip="Soglia massima di oggetti che devono arrivare in 10 secondi[Default 5]" />
     </panel>
 
     <!-- Alerts -->
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml
index 702c6c6ae2..b1c989fb3c 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml
@@ -49,9 +49,6 @@
         </text>
         <spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="[Quando arrivano molte richieste di precaricamento dei suoni contemporaneamente[Default: 4]" />
         <button name="AntiSpamUnblock" label="Sblocca tutte le fonti di Spam" />
-        <check_box label="Notifica quando gli oggetti arrivano troppo velocemente" name="FSNotifyIncomingObjectSpam" />
-        <check_box label="Notifica quando un'altro residente ti invia oggetti troppo velocemente" name="FSNotifyIncomingObjectSpamFrom" />
-        <slider name="FSOfferThrottleMaxCount" label="Limita soglia degli oggetti che arrivano:" tool_tip="Soglia massima di oggetti che devono arrivare in 10 secondi[Default 5]" />
 	</panel>
 	<!--Avatar-->
 	<panel label="Avatar" name="firestorm_avatar">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index b9d805a76f..1653e737fe 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -55,9 +55,11 @@
 	<panel label="インベントリ" name="tab-inventory">
 		<check_box name="FSShowUploadPaymentToast" label="アップロードの料金を支払った時" />
 		<check_box label="ランドマークを作成した時" name="landmark_created_checkbox" />
-		<check_box label="オブジェクトがインベントリに返却されましたという通知をしないようにする"
- name="FSDisableReturnObjectNotification" />
+		<check_box label="オブジェクトがインベントリに返却されましたという通知をしないようにする" name="FSDisableReturnObjectNotification" />
 		<check_box label="保存したスナップショットのファイル名を会話履歴に記録する" name="FSLogSnapshotsToLocal" />
+		<check_box label="オブジェクトからアイテムが一度にたくさん送られて来た場合に通知" name="FSNotifyIncomingObjectSpam" />
+		<check_box label="他の住人からアイテムが一度にたくさん送られて来た場合に通知" name="FSNotifyIncomingObjectSpamFrom" />
+		<slider name="FSOfferThrottleMaxCount" label="オブジェクト受け取り量の閾値：" tool_tip="10秒以内に送られて来るオブジェクト個数の閾値を設定します。5個がデフォルトです。" />
 	</panel>
 	
 	<!-- Alerts -->
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
index 32d838e774..834079fba6 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
@@ -79,12 +79,7 @@
         </text>
         <spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="Event multiplier for sound preload requests [Default: 4]"/>
         <button name="AntiSpamUnblock" label="スパム・ソースは全て無視する" />
-		<check_box label="参加費用がかかる場合はグループ招待の「参加」ボタンを表示しない
-" name="FSAllowGroupInvitationOnlyWithoutFee" />
-        <check_box label="オブジェクトからアイテムが一度にたくさん送られて来た場合に通知" name="FSNotifyIncomingObjectSpam" />
-        <check_box label="他の住人からアイテムが一度にたくさん送られて来た場合に通知" name="FSNotifyIncomingObjectSpamFrom" />
-        <slider name="FSOfferThrottleMaxCount" label="オブジェクト受け取り量の閾値：" tool_tip="10秒以内に送られて来るオブジェクト個数の閾値を設定します。5個がデフォルトです。" />
-		 
+		<check_box label="参加費用がかかる場合はグループ招待の「参加」ボタンを表示しない" name="FSAllowGroupInvitationOnlyWithoutFee" />
 	</panel>
 
 	<!-- アバター -->
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
index 98a7c33485..7c3f2e0fab 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
@@ -39,6 +39,9 @@
 		<check_box label="Powiadom, gdy zostanie utworzony Landmark" name="landmark_created_checkbox"/>
 		<check_box label="Wyłącz powiadomienia mówiące o zwróceniu przedmiotów do szafy" name="FSDisableReturnObjectNotification"/>
 		<check_box label="Pokazuj nazwy zapisanych zdjęć w historii czatu" name="FSLogSnapshotsToLocal"/>
+		<check_box label="Powiadom o zbyt szybkim słaniu przedmiotów przez obiekty" name="FSNotifyIncomingObjectSpam" />
+		<check_box label="Powiadom o zbyt szybkim słaniu przedmiotów przez innych Rezydentów" name="FSNotifyIncomingObjectSpamFrom" />
+		<slider name="FSOfferThrottleMaxCount" label="Limit ofert przychodzących obiektów:" tool_tip="Ustaw limit dla ofert przychodzących obiektów, w ciągu 10 sekund zanim zostaną one ograniczone. Domyślnie 5" />
 	</panel>
 	<panel label="Ostrzeżenia" name="tab-alerts">
 		<text name="show_label">
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
index 4bd1a4a5b7..f30b7b21df 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
@@ -68,9 +68,6 @@
         <spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="Mnożnik dla zdarzeń buforowania dźwięku [domyślnie: 4]" />
         <button name="AntiSpamUnblock" label="Odblokuj wszystkie źródła spamu" />
         <check_box label="Usuń przycisk &quot;Zaakceptuj&quot; z zaproszeń do grup, które pobierają opłatę za dołączenie" name="FSAllowGroupInvitationOnlyWithoutFee" />
-        <check_box label="Powiadom o zbyt szybkim słaniu przedmiotów przez obiekty" name="FSNotifyIncomingObjectSpam" />
-        <check_box label="Powiadom o zbyt szybkim słaniu przedmiotów przez innych Rezydentów" name="FSNotifyIncomingObjectSpamFrom" />
-        <slider name="FSOfferThrottleMaxCount" label="Limit ofert przychodzących obiektów:" tool_tip="Ustaw limit dla ofert przychodzących obiektów, w ciągu 10 sekund zanim zostaną one ograniczone. Domyślnie 5" />
     </panel>
     <panel label="Awatar" name="firestorm_avatar">
         <text name="HeadMovement">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
index 95ce105ab2..5f1a082fdd 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
@@ -39,6 +39,9 @@
 		<check_box label="Когда была создана закладка" name="landmark_created_checkbox"/>
 		<check_box label="Отключить уведомление 'Объект был возвращен в ваш инвентарь'" name="FSDisableReturnObjectNotification"/>
 		<check_box label="Записывать название файла сохраненных снимков в историю чата" name="FSLogSnapshotsToLocal"/>
+		<check_box label="Сообщать об элементах из объектов, приходящих слишком быстро" name="FSNotifyIncomingObjectSpam" />
+		<check_box label="Сообщать об элементах от других жителей, приходящих слишком быстро" name="FSNotifyIncomingObjectSpamFrom" />
+		<slider name="FSOfferThrottleMaxCount" label="Порог количества поступающих объектов:" tool_tip="Установите порог количества поступающих объектов в течении 10 секунд. По умолчанию 5" />
 	</panel>
 	<panel label="Оповещения" name="tab-alerts">
 		<text name="show_label">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
index 0732e46cc5..095e570f19 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
@@ -68,9 +68,6 @@
         <spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="Множитель запросов предзагрузки звуков [По умолчанию: 4]" />
         <button name="AntiSpamUnblock" label="Разблокировать все источники спама" />
         <check_box label="Убрать кнопку &quot;Присоедениться&quot; для приглашения вступить в платную группу" name="FSAllowGroupInvitationOnlyWithoutFee" />
-        <check_box label="Сообщать об элементах из объектов, приходящих слишком быстро" name="FSNotifyIncomingObjectSpam" />
-        <check_box label="Сообщать об элементах от других жителей, приходящих слишком быстро" name="FSNotifyIncomingObjectSpamFrom" />
-        <slider name="FSOfferThrottleMaxCount" label="Порог количества поступающих объектов:" tool_tip="Установите порог количества поступающих объектов в течении 10 секунд. По умолчанию 5" />
     </panel>
     <panel label="Аватар" name="firestorm_avatar">
         <text name="HeadMovement">