10 files changed, 46 insertions, 6 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2c5dffe..2dbb5ca 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,18 @@
 2009-10-13 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Applied patch for VWR-6787 by Alissa Sabre - 'none' text in group window not translatable.
+        
+          modified:   indra/newview/llfloatergroups.cpp
+          modified:   indra/newview/skins/default/xui/de/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/de/panel_groups.xml
+          modified:   indra/newview/skins/default/xui/en-us/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/en-us/panel_groups.xml
+          modified:   indra/newview/skins/default/xui/ja/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/ja/panel_groups.xml
+          modified:   indra/newview/skins/default/xui/ko/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/ko/panel_groups.xml
+          
+        
         * Combine the two mini-map mute buttons into one.
         
           modified:   linden/indra/newview/llfloatermap.cpp
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 23e2f4d..9599089 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -61,7 +61,7 @@
 std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances;
 
 // helper functions
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask = GP_ALL_POWERS);
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const std::string& none_text, U64 powers_mask = GP_ALL_POWERS);
 
 ///----------------------------------------------------------------------------
 /// Class LLFloaterGroupPicker
@@ -116,7 +116,8 @@ void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
 
 BOOL LLFloaterGroupPicker::postBuild()
 {
-        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), mPowersMask);
+        const std::string none_text = getString("none");
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text, mPowersMask);
 
         childSetAction("OK", onBtnOK, this);
 
@@ -200,7 +201,8 @@ void LLPanelGroups::reset()
         childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
         childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
 
-        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
+        const std::string none_text = getString("none");
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
         enableButtons();
 }
 
@@ -211,7 +213,8 @@ BOOL LLPanelGroups::postBuild()
         childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
         childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
 
-        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
+        const std::string none_text = getString("none");
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
 
         childSetAction("Activate", onBtnActivate, this);
 
@@ -457,7 +460,7 @@ void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata)
         if(self) self->enableButtons();
 }
 
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask)
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const std::string& none_text, U64 powers_mask)
 {
         S32 count = gAgent.mGroups.count();
         LLUUID id;
@@ -499,7 +502,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
                 LLSD element;
                 element["id"] = LLUUID::null;
                 element["columns"][0]["column"] = "name";
-                element["columns"][0]["value"] = "none"; // *TODO: Translate
+                element["columns"][0]["value"] = none_text;
                 element["columns"][0]["font"] = "SANSSERIF";
                 element["columns"][0]["font-style"] = style;
 
diff --git a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
index dd29aa7..327cb02 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+  <string name="none">
+    keine
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_groups.xml b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
index 95a2ef1..a7d6f98 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
@@ -12,4 +12,7 @@
         <button label="Verlassen" name="Leave" />
         <button label="Erstellen..." name="Create" />
         <button label="Suchen..." name="Search..." />
+  <string name="none">
+                keine
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
index 02001e9..f438262 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
@@ -18,4 +18,7 @@
         <button bottom="-236" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="88" mouse_opaque="true" name="Cancel"
              width="80" />
+  <string name="none">
+    none
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index c47985b..0bc7866 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -36,4 +36,7 @@
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Leave" name="Leave" width="80" />
+  <string name="none">
+                none
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 08c91f1..0e3153c 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="取り消し" label_selected="取り消し" name="Cancel" />
+  <string name="none">
+                グループなし
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index 785fd86..adfdcd4 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -13,4 +13,7 @@
         <button label="抜ける" name="Leave" />
         <button label="作成..." name="Create" />
         <button label="検索..." name="Search..." />
+  <string name="none">
+                グループなし
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
index 2cb821a..53bb889 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="확인" label_selected="확인" name="OK" />
         <button label="취소" label_selected="취소" name="Cancel" />
+  <string name="none">
+                그룹 없음
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
index cdd28a6..8e66006 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
@@ -13,4 +13,7 @@
         <button label="탈퇴" name="Leave" width="90"/>
         <button label="만들기" name="Create" width="90"/>
         <button label="검색" name="Search..." width="90"/>
+  <string name="none">
+                그룹 없음
+  </string>
 </panel>