Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r7502 -r7590
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7502)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7590)
@@ -102,7 +102,7 @@
 ToolBarButton.prototype.EditTitle = function() {
 	if (this.TranslateLink !== false) {
 		var $links = this.TranslateLink;
-		
+
 		$links = $links.split('::');
 		var $i = 0;
 		while ($i < $links.length) {
@@ -116,16 +116,16 @@
 				else {
 					window.location.href = 'http://' + $link;
 				}
-				
+
 				// edit one phrase at a time
 				break;
 			}
 			$i++;
 		}
-		
+
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -268,7 +268,7 @@
 	this.Module = $module ? $module : 'core';
 	this.IconPrefix = icon_prefix ? icon_prefix : 'tool_';
 	this.Buttons = new Array();
-	this.UseLabels = $use_toolbarlabels ? $use_toolbarlabels : false;
+	this.UseLabels = typeof($use_toolbarlabels) != 'undefined' ? $use_toolbarlabels : false;
 }
 
 ToolBar.prototype.AddButton = function(a_button)