Commits

eli  committed 9e86be1

sync with viewer-development

  • Participants
  • Parent commits 7b0bf0a

Comments (0)

Files changed (5)

File indra/newview/installers/windows/lang_ru.nsi

Binary file modified.

File indra/newview/installers/windows/lang_tr.nsi

Binary file modified.

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

 
   <notification
    icon="alertmodal.tga"
-   name="DisplaySetToRecommended"
-   type="alertmodal">
-Display settings have been set to recommended levels based on your system configuration.
+   name="DisplaySetToRecommendedGPUChange"
+   type="alertmodal">
+Display settings have been set to recommended levels because your graphics card changed
+from &apos;[LAST_GPU]&apos;
+to &apos;[THIS_GPU]&apos;
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DisplaySetToRecommendedFeatureChange"
+   type="alertmodal">
+Display settings have been set to recommended levels because of a change to the rendering subsystem.
   </notification>
 
   <notification

File indra/newview/skins/default/xui/en/panel_group_land_money.xml

          top="0"
          width="313">
             <text_editor
+             font="Monospace"
              enabled="false"
              type="string"
              follows="all"

File indra/newview/skins/default/xui/en/strings.xml

 	<string name="NextStipendDay"       value="The next stipend day is " />
 	<string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string>
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
-	<string name="GroupColumn"          value="                      Group" />
+	<string name="GroupColumn"          value="            Group" />
 	<string name="Balance">Balance</string>
 	<string name="Credits">Credits</string>
 	<string name="Debits">Debits</string>