From caee4320e2d86123a79ece5a99daf729a6cc9068 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 6 Mar 2013 10:09:25 +0100 Subject: [PATCH] Added localizability of pose names in pose stand floater --- indra/newview/app_settings/posestand.xml | 22 ++++++------ indra/newview/fsfloaterposestand.cpp | 3 +- .../newview/skins/default/xui/de/strings.xml | 35 +++++++++++++++++++ .../default/xui/en/floater_fs_posestand.xml | 4 +-- .../newview/skins/default/xui/en/strings.xml | 13 +++++++ 5 files changed, 63 insertions(+), 14 deletions(-) diff --git a/indra/newview/app_settings/posestand.xml b/indra/newview/app_settings/posestand.xml index f69ab042e5..b33c80bbb3 100644 --- a/indra/newview/app_settings/posestand.xml +++ b/indra/newview/app_settings/posestand.xml @@ -3,57 +3,57 @@ febde518-eba6-1628-9070-a2c227852324 name - T-pose + PS_T_Pose 8c607ae7-80a9-0004-5186-4e2bedafb256 name - Arms Down, Legs together + PS_Arms_Down_Legs_together 7ec0f76c-88ac-b9f2-778f-8fd95a30c7fc name - Arms down, sitting + PS_Arms_down_sitting a0f213b6-5506-3cf8-32ac-cfc9684048e7 name - Arms downward, Legs together + PS_Arms_downward_Legs_together 9e95943d-8020-e622-a4e0-4c9f8058091a name - Arms downward, Legs apart + PS_Arms_downward_Legs_apart 6c5e15de-7079-f558-d635-7123b7379dec name - Arms foreward, Legs apart + PS_Arms_foreward_Legs_apart 58401663-f5d3-828c-6cb5-ff618308e6be name - Arms foreward, Legs together + PS_Arms_foreward_Legs_together 7598be4b-6b1d-afaf-bc5e-0708fa3c214a name - Arms straight, Legs apart + PS_Arms_straight_Legs_apart 5acb15c0-1b14-6276-bd52-afdaad13cc1d name - Arms straight, sitting + PS_Arms_straight_sitting b28ee0ca-81b3-82f0-c3a3-5308efacf774 name - Arms upward, Legs apart + PS_Arms_upward_Legs_apart e2f67928-18ab-3991-4612-658cd88a1b4f name - Arms upward, Legs together + PS_Arms_upward_Legs_together \ No newline at end of file diff --git a/indra/newview/fsfloaterposestand.cpp b/indra/newview/fsfloaterposestand.cpp index 69e441e769..c0395ec48c 100644 --- a/indra/newview/fsfloaterposestand.cpp +++ b/indra/newview/fsfloaterposestand.cpp @@ -15,6 +15,7 @@ #include "fspose.h" #include "llsdserialize.h" +#include "lltrans.h" FSFloaterPoseStand::FSFloaterPoseStand(const LLSD& key) : LLFloater(key), @@ -59,7 +60,7 @@ void FSFloaterPoseStand::loadPoses() { for(LLSD::map_iterator p_itr = poses.beginMap(); p_itr != poses.endMap(); ++p_itr) { - mComboPose->add(p_itr->second["name"], LLUUID(p_itr->first)); + mComboPose->add(LLTrans::getString(p_itr->second["name"]), LLUUID(p_itr->first)); } } pose_file.close(); diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 22bf0b4ec1..7dc7856c70 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -5575,4 +5575,39 @@ Setzen Sie den Editorpfad in Anführungszeichen Farbe unter Cursor + + + + T-Pose + + + Arme unten, Beine zusammen + + + Arme unten, sitzend + + + Arme abwärts, Beine zusammen + + + Arme abwärts, Beine auseinander + + + Arme nach vorn, Beine auseinander + + + Arme nach vorn, Beine zusammen + + + Arme gerade, Beine auseinander + + + Arme gerade, sitzend + + + Arme aufwärts, Beine auseinander + + + Arme aufwärts, Beine zusammen + diff --git a/indra/newview/skins/default/xui/en/floater_fs_posestand.xml b/indra/newview/skins/default/xui/en/floater_fs_posestand.xml index aefbf327e0..5ca13875f1 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_posestand.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_posestand.xml @@ -1,7 +1,7 @@ + width="240"/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c689e4e75b..21b09a1ab8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -5043,4 +5043,17 @@ Try enclosing path to the editor with double quotes. Name Tags LookAt Target Color Under Cursor + + + T-Pose + Arms Down, Legs together + Arms down, sitting + Arms downward, Legs together + Arms downward, Legs apart + Arms foreward, Legs apart + Arms foreward, Legs together + Arms straight, Legs apart + Arms straight, sitting + Arms upward, Legs apart + Arms upward, Legs together