diff --git a/indra/newview/skins/default/xui/en/floater_omnifilter.xml b/indra/newview/skins/default/xui/en/floater_omnifilter.xml
index 743baf4baa..54b640af7e 100644
--- a/indra/newview/skins/default/xui/en/floater_omnifilter.xml
+++ b/indra/newview/skins/default/xui/en/floater_omnifilter.xml
@@ -121,33 +121,33 @@
 
 <text         name="match_source_label"   layout="topleft" follows="left|bottom" width="100" height="20" top_pad="4"      left="0"     valign="center" value="Match Source:" />
 
-<layout_stack orientation="horizontal" left="104" top_delta="0" right="-4" height="68" follows="left|right|bottom" layout="topleft">
+<layout_stack name="buttons_stack" orientation="horizontal" left="104" top_delta="0" right="-4" height="68" follows="left|right|bottom" layout="topleft">
 
-<layout_panel width="72" layout="topleft" follows="all">
+<layout_panel width="72" layout="topleft" follows="all" name="buttons_group_1">
 <button       name="type_nearby"          layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="0" label="Nearby Chat" tool_tip="Regular public avatar chat nearby." />
 <button       name="type_im"              layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4" label="IM" tool_tip="Instant messages from users." />
 <button       name="type_group_im"        layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4" label="Group Chat" tool_tip="Group chat from users." />
 </layout_panel>
 
-<layout_panel>
+<layout_panel name="buttons_group_2">
 <button       name="type_group_notice"    layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top="0"     label="Notice" tool_tip="Group notices." />
 <button       name="type_invite"          layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4" label="Invite" tool_tip="Group invitations." />
 <button       name="type_object_chat"     layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4" label="Object Chat" tool_tip="Nearby chat from objects." />
 </layout_panel>
 
-<layout_panel>
+<layout_panel name="buttons_group_3">
 <button       name="type_object_im"       layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top="0"      label="Object IM" tool_tip="Instant messages from objects." />
 <button       name="type_script_error"    layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4"  label="Error" tool_tip="Debug chat coming from scripts." />
 <button       name="type_dialog"          layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4"  label="Dialog" tool_tip="Matches fields in script dialogs." />
 </layout_panel>
 
-<layout_panel>
+<layout_panel name="buttons_group_4">
 <button       name="type_inventory_offer" layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top="0"      label="Offer" tool_tip="Matches fields in inventory offers." />
 <button       name="type_friendship"      layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4"  label="Friendship" tool_tip="Friend requests from users." />
 <button       name="type_lure"            layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4"  label="TP Lure" tool_tip="Teleport offers from users." />
 </layout_panel>
 
-<layout_panel>
+<layout_panel name="buttons_group_5">
 <button       name="type_tp_request"      layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top="0"      label="TP Request" tool_tip="Requests from users to send them a teleport offer." />
 <button       name="type_load_url"        layout="topleft" follows="left|right|top" width= "72" height="20" is_toggle="true" top_pad="4"  label="Load URL" tool_tip="Scripted requests to visit a website." />
 </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
index 85f224250d..f15c2c9f0f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
@@ -171,7 +171,7 @@ Settings groups to be restored (backup will always save all):
             <column name="restore_global_files_label">Controls</column>
             <column name="value">key_bindings.xml</column>
         </row>
-        <row name="restore_global_row_controls">
+        <row name="restore_global_row_omnifilter">
             <column type="checkbox" name="restore_global_files_check" value="true" />
             <column name="restore_global_files_label">Omnifilter</column>
             <column name="value">omnifilter.xml</column>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0a12ab046b..5fe503017f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2784,8 +2784,7 @@ name="Command_360_Capture_Label">360° Snapshot</string>
   <string name="Command_Primfeed_Tooltip">Post directly to your Primfeed account.</string>
   <string name="Command_Omnifilter_Label">Omnifilter</string>
 
-  <string 
-name="Command_360_Capture_Tooltip">Capture a 360° equirectangular image</string>
+  <string name="Command_360_Capture_Tooltip">Capture a 360° equirectangular image</string>
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_omnifilter.xml b/indra/newview/skins/default/xui/pl/floater_omnifilter.xml
new file mode 100644
index 0000000000..2253d4910c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_omnifilter.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="omnifilter" title="Edytor reguł Omnifiltra">
+	<layout_stack name="needle_list_stack">
+		<layout_panel name="needle_list_layout">
+			<check_box name="enable_omnifilter" label="Włącz Wszystkofiltr" />
+			<fs_scroll_list name="needle_list">
+				<fs_scroll_list.columns name="enabled" label="Wł" />
+				<fs_scroll_list.columns name="needle_name" label="Reguła" />
+			</fs_scroll_list>
+			<button name="add_needle" label="Dodaj" />
+			<button name="remove_needle" label="Usuń" />
+		</layout_panel>
+		<layout_panel name="filter_log_layout">
+			<fs_scroll_list name="filter_log">
+				<fs_scroll_list.columns name="timestamp" label="Czas (SLT)" />
+				<fs_scroll_list.columns name="log_entry" label="Reguła" />
+			</fs_scroll_list>
+		</layout_panel>
+	</layout_stack>
+	<panel name="panel_details">
+		<text name="needle_name_label" value="Nazwa reguły:" />
+		<text name="sender_name_label" value="Nadawca:" />
+		<combo_box name="sender_match_type">
+			<combo_item name="sender_exact">
+				<column name="longtext" label="Dopasuj cały tekst" />
+			</combo_item>
+			<combo_item name="sender_substring">
+				<column name="longtext" label="Dopasuj fragment" />
+			</combo_item>
+			<combo_item name="sender_regex">
+				<column name="longtext" label="Dopasuj wyraż. regularne" />
+			</combo_item>
+		</combo_box>
+		<text name="content_label" value="Treść:" />
+		<combo_box name="content_match_type">
+			<combo_item name="content_exact">
+				<column name="longtext" label="Dopasuj cały tekst" />
+			</combo_item>
+			<combo_item name="content_substring">
+				<column name="longtext" label="Dopasuj fragment" />
+			</combo_item>
+			<combo_item name="content_regex">
+				<column name="longtext" label="Dopasuj wyraż. regularne" />
+			</combo_item>
+		</combo_box>
+		<text name="region_name_label" value="Region:" />
+		<text name="owner_label" value="Właściciel:" />
+		<text name="match_source_label" value="Dopasuj z:" />
+		<layout_stack name="buttons_stack">
+			<layout_panel name="buttons_group_1">
+				<button name="type_nearby" label="Czat lokalny" tool_tip="Zwykły publiczny czat awatarów w pobliżu." />
+				<button name="type_im" tool_tip="Wiadomości prywatne od użytkowników." />
+				<button name="type_group_im" label="Czat grupy" tool_tip="Czat grupowy od użytkowników." />
+			</layout_panel>
+			<layout_panel name="buttons_group_2">
+				<button name="type_group_notice" label="Ogłoszenie" tool_tip="Powiadomienia / ogłoszenia grupowe." />
+				<button name="type_invite" label="Zaproszenie" tool_tip="Zaproszenia do grupy." />
+				<button name="type_object_chat" label="Czat obiektu" tool_tip="Czat lokalny od obiektów." />
+			</layout_panel>
+			<layout_panel name="buttons_group_3">
+				<button name="type_object_im" label="IM obiektu" tool_tip="Wiadomości IM od obiektów." />
+				<button name="type_script_error" label="Błąd" tool_tip="Komunikaty błędów ze skryptów." />
+				<button name="type_dialog" label="Okno skryptu" tool_tip="Dopasowuje pola w oknach dialogowych / komunikatach skryptów." />
+			</layout_panel>
+			<layout_panel name="buttons_group_4">
+				<button name="type_inventory_offer" label="Oferta" tool_tip="Dopasowuje pola w ofertach ekwipunku szafy." />
+				<button name="type_friendship" label="Znajomy" tool_tip="Prośby o dodanie do znajomych." />
+				<button name="type_lure" label="Oferta TP" tool_tip="Oferty teleportacji od użytkowników." />
+			</layout_panel>
+			<layout_panel name="buttons_group_5">
+				<button name="type_tp_request" label="Prośba TP" tool_tip="Prośby użytkowników o wysłanie oferty teleportu." />
+				<button name="type_load_url" label="Ładuj URL" tool_tip="Skryptowe prośby o otwarcie strony internetowej." />
+			</layout_panel>
+		</layout_stack>
+		<text name="chat_replace_label" value="Zastąp czatem:" />
+		<text name="button_reply_label" value="Wybierz przycisk:" />
+		<text name="text_box_reply_label" value="Odp. textboxem:" />
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index c5a9a1c736..bf76fcf595 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -10,6 +10,7 @@
 		<menu_item_check label="Ulubione rzeczy" name="WearableFavorites"/>
 		<menu_item_call label="Miejsca" name="Picks"/>
 		<menu_item_call label="Przygody" name="Experiences"/>
+		<menu_item_check label="Wszystkofiltr" name="Omnifilter" />
 		<menu_item_call label="Mój profil" name="Profile"/>
 		<menu_item_call label="Mój wygląd" name="NowWearing" />
 		<menu_item_check label="Moje stroje" name="ChangeOutfit"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index efa1f12522..5cb5bbfd41 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -5568,4 +5568,47 @@ https://wiki.firestormviewer.org/antivirus_whitelisting
 	<notification name="PrimfeedUserStatusFailed">
 		Zalogowanie użytkownika w Primfeed powiodło się, ale sprawdzenie statusu już nie. Sprawdź, czy Primfeed działa.
 	</notification>
+	<notification name="NotRegularFileError">
+		Oczekiwano zwykłego pliku w:
+[FILE_NAME]
+	</notification>
+	<notification name="NotFolderError">
+		Oczekiwano zwykłego folderu w:
+[FILE_NAME]
+	</notification>
+	<notification name="GenericFileEmptyError">
+		Plik istnieje, ale jest pusty:
+[FILE_NAME]
+
+Komunikat błędu:
+[ERROR_MESSAGE] ([ERROR_CODE])
+	</notification>
+	<notification name="GenericFileOpenReadError">
+		Nie można otworzyć pliku do odczytu:
+[FILE_NAME]
+
+Komunikat błędu:
+[ERROR_MESSAGE] ([ERROR_CODE])
+	</notification>
+	<notification name="GenericFileOpenWriteError">
+		Nie można otworzyć pliku do zapisu:
+[FILE_NAME]
+
+Komunikat błędu:
+[ERROR_MESSAGE] ([ERROR_CODE])
+	</notification>
+	<notification name="GenericFileReadError">
+		Nie można odczytać pliku:
+[FILE_NAME]
+
+Komunikat błędu:
+[ERROR_MESSAGE] ([ERROR_CODE])
+	</notification>
+	<notification name="GenericFileWriteError">
+		Nie można zapisać do pliku:
+[FILE_NAME]
+
+Komunikat błędu:
+[ERROR_MESSAGE] ([ERROR_CODE])
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_backup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_backup.xml
index 27e6924797..9987e8bf09 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_backup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_backup.xml
@@ -43,6 +43,9 @@
 						<row name="restore_global_row_controls">
 							<column name="restore_global_files_label">Sterowanie</column>
 						</row>
+						<row name="restore_global_row_omnifilter">
+							<column name="restore_global_files_label">Wszystkofiltr</column>
+						</row>
 					</scroll_list>
 				</layout_panel>
 				<layout_panel name="lp_restore_per_account_files">
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 22d8fb2a46..97534bfde1 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -5533,6 +5533,9 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Primfeed_Tooltip">
 		Publikuj bezpośrednio na swoim koncie Primfeed.
 	</string>
+	<string name="Command_Omnifilter_Label">
+		Wszystkofiltr
+	</string>
 	<string name="Command_360_Capture_Tooltip">
 		Uchwyć równoprostokątny obraz 360°
 	</string>
@@ -5719,6 +5722,9 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Beacons_Tooltip">
 		Pokaż emitery
 	</string>
+	<string name="Command_Omnifilter_Tooltip">
+		Edytuj reguły Wszystkofiltra
+	</string>
 	<string name="Toolbar_Bottom_Tooltip">
 		obecnie na Twoim dolnym pasku
 	</string>
@@ -6694,4 +6700,7 @@ Twoja aktualna pozycja: [AVATAR_POS]
 	<string name="Maximum">
 		Maksymalnie
 	</string>
+	<string name="OmnifilterNewNeedle">
+		NOWA REGUŁA
+	</string>
 </strings>