From 55490574c873881306cfc69dee2f0453f92da52f Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 15 Nov 2014 20:18:45 +0100
Subject: Additional changes for commit 999f81951c14 - necessary changes for
 files in /en/ directory in order to make files properly localizable Also,
 removing some found duplicates in notifications.xml

---
 .../xui/en/floater_inventory_view_finder.xml       |  2 ++
 .../newview/skins/default/xui/en/notifications.xml | 22 ----------------------
 .../default/xui/en/panel_preferences_chat.xml      |  7 ++++++-
 .../default/xui/en/panel_preferences_setup.xml     |  2 +-
 .../default/xui/en/panel_prim_media_controls.xml   |  1 +
 .../xui/pl/floater_inventory_view_finder.xml       |  4 ++--
 .../default/xui/pl/panel_preferences_chat.xml      | 12 ++++++------
 .../default/xui/pl/panel_preferences_setup.xml     |  2 +-
 .../default/xui/pl/panel_prim_media_controls.xml   |  2 +-
 9 files changed, 20 insertions(+), 34 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 17bc818cc1..519d3e043c 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -301,6 +301,7 @@
      top_pad="4"
      width="64" />
     <text
+     name="label_hours"
      type="string"
      length="1"
      follows="left|top"
@@ -323,6 +324,7 @@
      left="8"
      width="64" />
     <text
+     name="label_days"
      type="string"
      length="1"
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f1d34a1449..05bda0259d 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3792,30 +3792,8 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
-  <notification
-   icon="aler.tga"
-   name="GroupDepartError"
-   type="alert">
-Unable to leave group: [reason].
-      <tag>reason</tag>
-      <usetemplate
-       name="okbutton"
-       yestext="OK"/>
-  </notification>
-
   <notification
    icon="alert.tga"
-   name="GroupDepart"
-   type="alert">
-You have left the group [group_name].
-      <tag>group_name</tag>
-      <usetemplate
-       name="okbutton"
-       yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="aler.tga"
    name="GroupDepartError"
    type="alert">
 Unable to leave group: [reason].
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 8e867259c5..8d55e311f6 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -453,6 +453,7 @@
       width="505">
 
     <text
+        name="logging_label"
         layout="topleft"
         left="0"
         text_color="White"
@@ -468,16 +469,19 @@
         height="23"
         layout="topleft"
         left_pad="5"
-        name="chat_font_size"
+        name="conversation_log_combo"
         top="0"
         width="165">
         <item
+            name="log_and_transcripts"
             label="Log and transcripts"
             value="2"/>
         <item
+            name="log_only"
             label="Log only"
             value="1"/>
         <item
+            name="no_log_or_transcript"
             label="No log or transcripts"
             value="0"/>
     </combo_box>
@@ -509,6 +513,7 @@
     </button>
   
     <text
+        name="log_location_label"
         layout="topleft"
         left="0"
         text_color="White"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 1e9a1aa27c..10f2a3a8b9 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -173,7 +173,7 @@
       label="Use built-in browser for all links"
       layout="topleft"
       left="0"
-      name="internal"
+      name="external_all"
       value="2"
       tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
       top_delta="20"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 8f90521bb2..eb67d07601 100755
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -338,6 +338,7 @@
 		  mouse_opaque="false"
 		  orientation="horizontal">
 		<layout_panel
+			name="media_address_url_icons_wl"
 			layout="topleft"
 			width="16"
 			mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
index 7102045491..4c09b3d643 100755
--- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
@@ -23,10 +23,10 @@
 		<radio_item label="Nowsze niż" name="newer" />
 		<radio_item label="Starsze niż" name="older" />
 	</radio_group>
-	<text>
+	<text name="label_hours">
 		Godzin
 	</text>
-	<text>
+	<text name="label_days">
 		Dni
 	</text>
 	<button label="Zamknij" label_selected="Zamknij" name="Close" />
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index f44a8b6ad6..77ffa17ea9 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -89,17 +89,17 @@
 		<check_box label="Propozycja przedmiotu" name="inventory_offer" />
 	</panel>
 	<panel name="log_settings">
-		<text>
+		<text name="logging_label">
 			Zapisywanie:
 		</text>
-		<combo_box name="chat_font_size">
-			<item label="Dziennik i logi rozmów" />
-			<item label="Tylko dziennik" />
-			<item label="Nie zapisuj dziennika ani logów rozmów" />
+		<combo_box name="conversation_log_combo">
+			<item name="log_and_transcripts" label="Dziennik i logi rozmów" />
+			<item name="log_only" label="Tylko dziennik" />
+			<item name="no_log_or_transcript" label="Nie zapisuj dziennika ani logów rozmów" />
 		</combo_box>
 		<button label="Wyczyść dziennik" name="clear_log" />
 		<button label="Usuń logi rozmów" name="delete_transcripts" />
-		<text>
+		<text name="log_location_label">
 			Miejsce zapisu:
 		</text>
 		<button label="Przeglądaj" label_selected="Przeglądaj" name="log_path_button" />
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index 02f182d97e..bd36f10509 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -14,7 +14,7 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Własna (Chrome, Firefox, IE) dla wszystkich linków" name="internal" tool_tip="Używa domyślnej systemowej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Nie jest zalecane zaznaczanie tej opcji, jeśli uruchamiasz Second Life na pełnym ekranie." />
 		<radio_item label="Wbudowana tylko dla linków Second Life" name="external" tool_tip="Używa domyślnej systemowej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Przeglądarka wbudowana będzie używana tylko dla linków LindenLab/SecondLife." />
-		<radio_item label="Wbudowana dla wszystkich linków" name="internal" tool_tip="Używa wbudowanej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Ta przeglądarka otwiera nowe okienko wewnątrz [APP_NAME]." />
+		<radio_item label="Wbudowana dla wszystkich linków" name="external_all" tool_tip="Używa wbudowanej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Ta przeglądarka otwiera nowe okienko wewnątrz [APP_NAME]." />
 	</radio_group>
 	<check_box label="Włącz wtyczki" name="browser_plugins_enabled" />
 	<check_box label="Akceptuj ciasteczka" name="cookies_enabled" />
diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
index 013219f297..0560f51143 100755
--- a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
@@ -34,7 +34,7 @@
 			<line_editor name="media_address_url" tool_tip="URL mediów" />
 			<icon name="media_secure_lock_flag" tool_tip="Bezpieczne przeglądanie" />
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Biała lista aktywna" />
 				</layout_panel>
 			</layout_stack>
-- 
cgit v1.2.3