diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 0312344ba..95e321df3 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -64,7 +64,7 @@ public:
 		virtual bool compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const = 0;
 	};
 
-	/* Singu TODO: LLPanel::Params, LLTextBox::Params
+	#if 0 // Singu TODO: LLPanel::Params, LLTextBox::Params
 	struct Params 
 		: public LLInitParam::Block<Params, LLPanel::Params>
 	{
@@ -73,7 +73,7 @@ public:
 								accordion tabs are responsible for scrolling their content.
 								*NOTE fit_parent works best when combined with single_expansion.
 								Accordion view should implement getRequiredRect() and provide valid height*/
-		/*Optional<LLTextBox::Params>	no_matched_tabs_text;
+		Optional<LLTextBox::Params>	no_matched_tabs_text;
 		Optional<LLTextBox::Params>	no_visible_tabs_text;
 
 		Params()
@@ -84,7 +84,8 @@ public:
 		{};
 	};
 
-	LLAccordionCtrl(const Params& params);*/
+	LLAccordionCtrl(const Params& params);
+	#endif
 
     LLAccordionCtrl();
     virtual ~LLAccordionCtrl();
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 4f1686660..a86527f56 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -40,6 +40,7 @@
 #include "llresmgr.h"
 #include "llresizehandle.h"
 #include "lltextbox.h"
+#include "lltrans.h"
 #include "llcriticaldamp.h"
 #include "lluictrlfactory.h"
 #include "llrender.h"
@@ -873,9 +874,16 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 			}
 		}
 		std::string tooltip = trimmed_label;
-		// FIXME: Tooltip can not be translated when hardcoded.
-		tooltip += "\nAlt-Left arrow for previous tab";
-		tooltip += "\nAlt-Right arrow for next tab";
+		LLStringUtil::format_map_t args;
+		args["[ALT]"] = LLTrans::getString(
+#ifdef LL_DARWIN
+		"accel-mac-option"
+#else
+		"accel-win-alt"
+#endif
+		);
+		tooltip += '\n' + LLTrans::getString("tab_tooltip_prev", args);
+		tooltip += '\n' + LLTrans::getString("tab_tooltip_next", args);
 		btn->setToolTip( tooltip );
 	}
 
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index b514b5f23..cd1faf0fb 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3496,6 +3496,10 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="accel-win-alt">Alt-</string>
 	<string name="accel-win-shift">Shift-</string>
 
+	<!-- Tab Containers -->
+	<string name="tab_tooltip_prev">[ALT]Left arrow for previous tab</string>
+	<string name="tab_tooltip_next">[ALT]Right arrow for next tab</string>
+
 	<!-- Previews -->
 	<string name="FileSaved">File Saved</string>
 	<string name="Receiving">Receiving</string>