summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-11 14:57:14 -0500
committerOz Linden <oz@lindenlab.com>2011-11-11 14:57:14 -0500
commitebf0b70e05f2d6539dd14c28a8a327105523025d (patch)
tree6a71ae80dbe10b45a8c5c538042cb32ed323098b
parent201c6cd5ec3abdc2c1ddf8960515f0334c7dd9a8 (diff)
parent8f0ef6fcb044b6559356bf23afd0516cb7636bba (diff)
merge changes for vmrg-183
-rw-r--r--indra/newview/skins/default/xui/ru/floater_destinations.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml
index e769812beb..bb068c8125 100644
--- a/indra/newview/skins/default/xui/ru/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ru/floater_destinations.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Destinations" title="МЕСТА"/>
+<floater name="Destinations" title="ПУНКТЫ"/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index df657b39c6..89a2c2543d 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -4794,7 +4794,7 @@ support@secondlife.com.
Компас
</string>
<string name="Command_Destinations_Label">
- Места
+ Пункты
</string>
<string name="Command_Gestures_Label">
Жесты