Texture view "Keep"/"Discard" buttons are in reverse order. Also, changed Keep/Discard to OK/Cancel

EXT-762

indra/newview/skins/default/xui/en/floater_preview_texture.xml

@@ -45,19 +45,19 @@
     <button
      follows="left|bottom"
      height="22"
-     label="Delete"
+     label="OK"
      layout="topleft"
      left="80"
-     name="Discard"
-     top="283"
+     name="Keep"
+     top="302"
      width="100" />
     <button
      follows="left|bottom"
      height="22"
-     label="Save"
+     label="Cancel"
      layout="topleft"
      left_pad="5"
-     name="Keep"
+     name="Discard"
      top_delta="0"
      width="100" />
      <text

indra/newview/skins/default/xui/en/notifications.xml

@@ -5767,11 +5767,11 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT
       <button
        index="0"
        name="Keep"
-       text="Keep"/>
+       text="OK"/>
       <button
        index="1"
        name="Discard"
-       text="Discard"/>
+       text="Cancel"/>
       <button
        index="2"
        name="Mute"
@@ -5788,11 +5788,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
       <button
        index="0"
        name="Keep"
-       text="Keep"/>
+       text="OK"/>
       <button
        index="1"
        name="Discard"
-       text="Discard"/>
+       text="Cancel"/>
       <button
        index="2"
        name="Mute"
@@ -5809,11 +5809,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
       <button
        index="0"
        name="Keep"
-       text="Keep"/>
+       text="OK"/>
       <button
        index="1"
        name="Discard"
-       text="Discard"/>
+       text="Cancel"/>
       <button
        index="2"
        name="Mute"