From abecce4887a4b1c40476f88836ef76baec026a7a Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 25 Oct 2014 21:29:20 +0200
Subject: Additional changes for commit 8cc91b833acb - necessary changes for
 files in /en/ directory in order to make files properly localizable Also,
 fixes a bug in /en/ for floater_model_preview - "value" is not "label";
 Sending localized string in "value" may cause a viewer error

---
 .../skins/default/xui/en/floater_autoreplace.xml      |  2 ++
 .../skins/default/xui/en/floater_fast_timers.xml      | 14 +++++++-------
 .../skins/default/xui/en/floater_merchant_outbox.xml  |  4 ++++
 .../skins/default/xui/en/floater_model_preview.xml    | 19 +++++++++++++++++++
 .../default/xui/en/floater_pathfinding_characters.xml |  2 ++
 .../default/xui/en/floater_pathfinding_console.xml    |  4 ++++
 .../default/xui/en/floater_pathfinding_linksets.xml   |  8 ++++++++
 .../skins/default/xui/en/floater_perms_default.xml    | 12 ++++++++++++
 .../default/xui/en/floater_spellcheck_import.xml      |  3 +++
 9 files changed, 61 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
index 0bfefc8abe..9cfb562001 100755
--- a/indra/newview/skins/default/xui/en/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
@@ -184,6 +184,7 @@
    mouse_opaque="false"
    name="divisor3"/>
   <text
+   name="autoreplace_keyword_txt"
    type="string"
    follows="left|top"
    height="16"
@@ -204,6 +205,7 @@
    width="150"
    />
   <text
+   name="autoreplace_replacement_txt"
    type="string"
    follows="left|top"
    height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 671f116df3..5d83ad6bea 100755
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -22,10 +22,10 @@
              top="5"
              width="150"
              height="20">
-    <item label="2x Average"/>
-    <item label="Max"/>
-    <item label="Recent Max"/>
-    <item label="100ms"/>
+    <item name="2x Average" label="2x Average"/>
+    <item name="Max" label="Max"/>
+    <item name="Recent Max" label="Recent Max"/>
+    <item nme="100ms" label="100ms"/>
   </combo_box>
   <combo_box name="metric_combo"
              follows="left|top"
@@ -33,9 +33,9 @@
              top="5"
              width="150"
              height="20">
-    <item label="Time"/>
-    <item label="Number of Calls"/>
-    <item label="Hz"/>
+    <item name="Time" label="Time"/>
+    <item name="Number of Calls" label="Number of Calls"/>
+    <item name="Hz" label="Hz"/>
   </combo_box>
   <button follows="top|right" 
           name="pause_btn"
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
index b98f280b56..7802f65902 100755
--- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
@@ -19,6 +19,7 @@
   <string name="OutboxImporting">Sending folders...</string>
   <string name="OutboxInitializing">Initializing...</string>
   <panel
+      name="panel_1"
       follows="all"
       layout="topleft"
       left="0"
@@ -27,6 +28,7 @@
       height="440"
       width="333">
     <panel
+        name="panel_2"
         follows="all"
         left="10"
         bottom="370"
@@ -70,6 +72,7 @@
       </panel>
     </panel>
     <panel
+        name="panel_3"
         follows="bottom|left|right"
         left="10"
         bottom="435"
@@ -89,6 +92,7 @@
           bevel_style="in"
           visible="true">
         <text
+            name="text_1"
             type="string"
             follows="all"
             layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index a4acd1df78..56bf9833f5 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -184,9 +184,11 @@
              width="135">
                 <item
                  name="Load from file"
+                 label="Load from file"
                  value="Load from file" />
                 <item
                  name="Generate"
+                 label="Generate"
                  value="Generate" />
             </combo_box>
             <line_editor
@@ -219,9 +221,11 @@
              width="130">
                 <item
                  name="Triangle Limit"
+                 label="Triangle Limit"
                  value="Triangle Limit" />
                 <item
                  name="Error Threshold"
+                 label="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -309,12 +313,15 @@
              width="135">
                 <item
                  name="Load from file"
+                 label="Load from file"
                  value="Load from file" />
                 <item
                  name="Generate"
+                 label="Generate"
                  value="Generate" />
                 <item
                  name="Use LoD above"
+                 label="Use LoD above"
                  value="Use LoD above" />
             </combo_box>
             <line_editor
@@ -348,9 +355,11 @@
              width="130">
                 <item
                  name="Triangle Limit"
+                 label="Triangle Limit"
                  value="Triangle Limit" />
                 <item
                  name="Error Threshold"
+                 label="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -437,12 +446,15 @@
              width="135">
                 <item
                  name="Load from file"
+                 label="Load from file"
                  value="Load from file" />
                 <item
                  name="Generate"
+                 label="Generate"
                  value="Generate" />
                 <item
                  name="Use LoD above"
+                 label="Use LoD above"
                  value="Use LoD above" />
             </combo_box>
             <line_editor
@@ -476,9 +488,11 @@
              width="130">
                 <item
                  name="Triangle Limit"
+                 label="Triangle Limit"
                  value="Triangle Limit" />
                 <item
                  name="Error Threshold"
+                 label="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -565,12 +579,15 @@
              width="135">
                 <item
                  name="Load from file"
+                 label="Load from file"
                  value="Load from file" />
                 <item
                  name="Generate"
+                 label="Generate"
                  value="Generate" />
                 <item
                  name="Use LoD above"
+                 label="Use LoD above"
                  value="Use LoD above" />
             </combo_box>
             <line_editor
@@ -604,9 +621,11 @@
              width="130">
                 <item
                  name="Triangle Limit"
+                 label="Triangle Limit"
                  value="Triangle Limit" />
                 <item
                  name="Error Threshold"
+                 label="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 46ee113b69..7242c734cf 100755
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -27,6 +27,7 @@
   <floater.string name="character_owner_unknown">[Unknown]</floater.string>
   <floater.string name="character_owner_group">[group]</floater.string>
   <panel
+      name="pathfinding_chars_main"
       border="false"
       bevel_style="none"
       follows="left|top|right|bottom"
@@ -118,6 +119,7 @@
       left="18"
       width="600"/>
   <panel
+      name="pathfinding_chars_actions"
       border="false"
       bevel_style="none"
       follows="left|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 2629313069..eb37cf214c 100755
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -37,6 +37,7 @@
   <floater.string name="pathing_path_invalid">A path between the chosen points cannot be found.</floater.string>
   <floater.string name="pathing_error">An error occurred during path generation.</floater.string>
   <panel
+      name="pathfinding_console_main"
       border="false"
       bevel_style="none"
       follows="left|top"
@@ -46,6 +47,7 @@
       height="61"
       width="214">
     <text
+        name="viewer_status_label"
         height="13"
         word_wrap="true"
         use_ellipses="false"
@@ -74,6 +76,7 @@
     </text>
   </panel>
   <panel
+      name="pathfinding_console_simulator"
       border="false"
       bevel_style="none"
       follows="left|top"
@@ -82,6 +85,7 @@
       height="66"
       width="214">
     <text
+        name="simulator_status_label"
         height="13"
         word_wrap="true"
         use_ellipses="false"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index 4a457fb929..52d03cc432 100755
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -46,6 +46,7 @@
   <floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
   <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
   <panel
+      name="pathfinding_linksets_main"
       border="false"
       bevel_style="none"
       follows="left|top|right|bottom"
@@ -53,6 +54,7 @@
       height="226"
       width="1059">
     <text
+        name="linksets_filter_label"
         height="13"
         word_wrap="false"
         use_ellipses="false"
@@ -67,6 +69,7 @@
       Filter by:
     </text>
     <text
+        name="linksets_name_label"
         height="13"
         word_wrap="false"
         use_ellipses="false"
@@ -91,6 +94,7 @@
         name="filter_by_name"
         width="161" />
     <text
+        name="linksets_desc_label"
         height="13"
         word_wrap="false"
         use_ellipses="false"
@@ -279,6 +283,7 @@
       left="18"
       width="1039"/>
   <panel
+      name="pathfinding_linksets_actions"
       border="false"
       bevel_style="none"
       follows="left|right|bottom"
@@ -287,6 +292,7 @@
       height="67"
       width="1010">
     <text
+        name="linksets_actions_label"
         height="13"
         word_wrap="false"
         use_ellipses="false"
@@ -366,6 +372,7 @@
       left="18"
       width="1039"/>
   <panel
+      name="pathfinding_linksets_attributes"
       border="false"
       bevel_style="none"
       follows="left|right|bottom"
@@ -374,6 +381,7 @@
       height="75"
       width="1010">
     <text
+        name="linksets_attributes_label"
         height="13"
         word_wrap="false"
         use_ellipses="false"
diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index ceb260fffb..1c3af49bfe 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -24,6 +24,7 @@
        left="0"
        width="430" /> 
       <text
+       name="label_1"
        type="string"
        length="1"
        follows="left|top"
@@ -36,6 +37,7 @@
          Next owner:
       </text>
       <text
+       name="label_2"
        type="string"
        length="1"
        follows="left|top"
@@ -48,6 +50,7 @@
           Copy
       </text>
       <text
+       name="label_3"
        type="string"
        length="1"
        follows="left|top"
@@ -60,6 +63,7 @@
           Modify
       </text>
       <text
+       name="label_4"
        type="string"
        length="1"
        follows="left|top"
@@ -72,6 +76,7 @@
           Transfer
       </text>    
       <text
+       name="label_5"
        type="string"
        length="1"
        follows="left|top"
@@ -85,6 +90,7 @@
           Share with group
       </text>
       <text
+       name="label_6"
        type="string"
        length="1"
        follows="left|top"
@@ -98,6 +104,7 @@
           Allow anyone to copy
       </text>
       <text
+       name="label_7"
        type="string"
        length="1"
        follows="left|top"
@@ -162,6 +169,7 @@
        top_delta="0"
        width="100" />
       <text
+       name="label_8"
        type="string"
        length="1"
        follows="left|top"
@@ -225,6 +233,7 @@
        top_delta="0"
        width="100" />
       <text
+       name="label_9"
        type="string"
        length="1"
        follows="left|top"
@@ -288,6 +297,7 @@
        top_delta="0"
        width="100" />
       <text
+       name="label_10"
        type="string"
        length="1"
        follows="left|top"
@@ -351,6 +361,7 @@
        top_delta="0"
        width="100" />
       <text
+       name="label_11"
        type="string"
        length="1"
        follows="left|top"
@@ -414,6 +425,7 @@
        top_delta="0"
        width="100" />
       <text
+       name="label_12"
        type="string"
        length="1"
        follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
index b54090015d..94393a6c77 100755
--- a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
@@ -11,6 +11,7 @@
  name="spellcheck_import"
  title="Import Dictionary">
   <text
+   name="import_dict"
    follows="top|left"
    height="16"
    layout="topleft"
@@ -41,6 +42,7 @@
    top_delta="0"
    width="75" />
   <text
+   name="import_name"
    follows="top|left"
    height="16"
    layout="topleft"
@@ -61,6 +63,7 @@
    top_delta="-5"
    width="200" />
   <text
+   name="import_lang"
    follows="top|left"
    height="16"
    layout="topleft"
-- 
cgit v1.2.3


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 +
 5 files changed, 10 insertions(+), 24 deletions(-)

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

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"
-- 
cgit v1.2.3


From f4aa7919a67e4d9b7a96e509f926975f1c1d25da Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 15 Nov 2014 20:28:04 +0100
Subject: Removing redundant '-->'

---
 indra/newview/skins/default/xui/en/menu_viewer.xml                 | 3 +--
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index de441983d0..c0dff9a852 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3533,7 +3533,7 @@
                  function="Advanced.ToggleInfoDisplay"
                  parameter="agent target" />
             </menu_item_check>
-<!-- Appears not to exist anymore
+            <!-- Appears not to exist anymore
             <menu_item_check
              label="Debug Rotation"
              name="Debug Rotation">
@@ -3544,7 +3544,6 @@
                  function="ToggleControl"
                  parameter="DebugAvatarRotation" />
             </menu_item_check> -->
--->
             <menu_item_call
              label="Dump Attachments"
              name="Dump Attachments">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6c485c0595..3344b97794 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -858,7 +858,7 @@
            name="2"
            top_delta="16"
            width="50" />
-      </radio_group> -->
+      </radio_group>
 	</panel>
 	
     <button
-- 
cgit v1.2.3