svn merge ^/trunk/blender -r50999:51100soc-2012-bratwurst

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 30045c45dad..37dd00f6394 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1472,39 +1472,39 @@ void ED_area_prevspace(bContext *C, ScrArea *sa)
 static const char *editortype_pup(void)
 {
 	const char *types = N_(
-	    "Editor type:%t"
+	    "Editor type: %t"
 	    "|3D View %x1"
 
 	    "|%l"
-		   
+
 	    "|Timeline %x15"
 	    "|Graph Editor %x2"
 	    "|DopeSheet %x12"
 	    "|NLA Editor %x13"
-		   
+
 	    "|%l"
-		   
+
 	    "|UV/Image Editor %x6"
-		   
+
 	    "|Video Sequence Editor %x8"
 	    "|Movie Clip Editor %x20"
 	    "|Text Editor %x9"
 	    "|Node Editor %x16"
 	    "|Logic Editor %x17"
-		   
+
 	    "|%l"
-		   
+
 	    "|Properties %x4"
 	    "|Outliner %x3"
 	    "|User Preferences %x19"
-	    "|Info%x7"
+	    "|Info %x7"
 
 	    "|%l"
 
 	    "|File Browser %x5"
-		   
+
 	    "|%l"
-		   
+
 	    "|Python Console %x18"
 	    );
 
@@ -1530,7 +1530,7 @@ int ED_area_header_switchbutton(const bContext *C, uiBlock *block, int yco)
 	but = uiDefIconTextButC(block, ICONTEXTROW, 0, ICON_VIEW3D, 
 	                        editortype_pup(), xco, yco, UI_UNIT_X + 10, UI_UNIT_Y,
 	                        &(sa->butspacetype), 1.0, SPACEICONMAX, 0, 0,
-	                        TIP_("Displays current editor type. Click for menu of available types"));
+	                        TIP_("Display current editor type (click for menu of available types)"));
 	uiButSetFunc(but, spacefunc, NULL, NULL);
 	uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */