From faf5a8e69411a74281c0ed84cc06f26623436197 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Fri, 29 Nov 2013 08:47:25 +0100 Subject: [PATCH] Translation and debranding fixes --- indra/llui/llmenugl.cpp | 4 ++ .../skins/default/xui/de/floater_about.xml | 9 +-- .../skins/default/xui/de/menu_login.xml | 2 +- .../skins/default/xui/de/menu_viewer.xml | 2 +- .../skins/default/xui/en-us/menu_login.xml | 2 +- .../skins/default/xui/en-us/menu_viewer.xml | 2 +- .../skins/default/xui/es/floater_about.xml | 20 +++---- .../default/xui/es/floater_voice_effect.xml | 2 +- .../skins/default/xui/es/menu_login.xml | 2 +- .../skins/default/xui/es/menu_viewer.xml | 2 +- .../skins/default/xui/fr/floater_about.xml | 10 ++-- .../skins/default/xui/fr/menu_login.xml | 2 +- .../skins/default/xui/fr/menu_viewer.xml | 2 +- .../skins/default/xui/it/floater_about.xml | 60 +++---------------- .../skins/default/xui/it/menu_login.xml | 2 +- .../skins/default/xui/it/menu_viewer.xml | 2 +- .../xui/it/panel_preferences_graphics1.xml | 2 +- .../skins/default/xui/pt/menu_login.xml | 4 +- .../skins/default/xui/pt/menu_viewer.xml | 2 +- scripts/check_xml.sh | 38 ++++++++++++ 20 files changed, 82 insertions(+), 89 deletions(-) create mode 100755 scripts/check_xml.sh diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index deebb57e9..27df264af 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -1963,6 +1963,8 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory child->getAttributeString("type", type); child->getAttributeString("name", item_name); child->getAttributeString("label", source_label); + + LLStringUtil::format(source_label, LLTrans::getDefaultArgs()); // parse jump key out of label typedef boost::tokenizer > tokenizer; @@ -2303,6 +2305,8 @@ LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa std::string label = name; node->getAttributeString("label", label); + LLStringUtil::format(label, LLTrans::getDefaultArgs()); + // parse jump key out of label std::string new_menu_label; diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index 75e60e0a3..188c19b15 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -2,13 +2,10 @@ -