From 506b78bfbb6ddfddbe1a84d1fb2964eb586ef5c9 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Sat, 5 Jun 2004 05:55:15 +0000 Subject: * Big, mundane clean up and edit of (error/ok/etc) messages and pupmenu()s. Edited spelling and grammar, stylistic consistency, etc. I added the guidelines and rationale that I used to the CMS here: http://www.blender3d.org/cms/Language_and_terminology.338.0.html Next step is to get icons in there, to make it easier to see at a glance what sort of message (and how much attention should be paid to it, or if it can be dismissed with a flick of the mouse, eg. boring remove doubles notifications) mockup: http://mke3.net:9000/blender/ui/controls/error_ok_icons.png --- source/blender/src/butspace.c | 6 +-- source/blender/src/buttons_scene.c | 2 +- source/blender/src/drawscript.c | 2 +- source/blender/src/drawtext.c | 22 +++++----- source/blender/src/drawview.c | 4 +- source/blender/src/edit.c | 9 ++--- source/blender/src/editaction.c | 16 ++++---- source/blender/src/editarmature.c | 8 ++-- source/blender/src/editcurve.c | 24 +++++------ source/blender/src/editdeform.c | 4 +- source/blender/src/editface.c | 16 ++++---- source/blender/src/editfont.c | 2 +- source/blender/src/editimasel.c | 2 +- source/blender/src/editipo.c | 24 +++++------ source/blender/src/editkey.c | 2 +- source/blender/src/editlattice.c | 4 +- source/blender/src/editmesh.c | 66 +++++++++++++++--------------- source/blender/src/editnla.c | 10 ++--- source/blender/src/editobject.c | 82 +++++++++++++++++++------------------- source/blender/src/editscreen.c | 8 ++-- source/blender/src/editseq.c | 38 +++++++++--------- source/blender/src/editsima.c | 2 +- source/blender/src/interface.c | 2 +- source/blender/src/seqaudio.c | 2 +- source/blender/src/space.c | 10 ++--- source/blender/src/toets.c | 34 ++++++++-------- source/blender/src/vpaint.c | 6 +-- 27 files changed, 203 insertions(+), 204 deletions(-) diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index b2e0c95e9e9..b23eabd118e 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -132,7 +132,7 @@ void test_obpoin_but(char *name, ID **idpp) ID *id; if(idpp == (ID **)&(emptytex.object)) { - error("You must add a Texture first!"); + error("You must add a texture first"); *idpp= 0; return; } @@ -153,7 +153,7 @@ void test_obcurpoin_but(char *name, ID **idpp) ID *id; if(idpp == (ID **)&(emptytex.object)) { - error("You must add a Texture first!"); + error("You must add a texture first"); *idpp= 0; return; } @@ -162,7 +162,7 @@ void test_obcurpoin_but(char *name, ID **idpp) while(id) { if( strcmp(name, id->name+2)==0 ) { if (((Object *)id)->type != OB_CURVE) { - error ("Bevel object must be a Curve."); + error ("Bevel object must be a curve"); break; } *idpp= id; diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index d1ab737b64e..45e3fb3008f 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1114,7 +1114,7 @@ static void render_panel_format(void) block= uiNewBlock(&curarea->uiblocks, "render_panel_format", UI_EMBOSS, UI_HELV, curarea->win); if(uiNewPanel(curarea, block, "Format", "Render", 960, 0, 318, 204)==0) return; - uiDefBlockBut(block, framing_render_menu, NULL, "Game framing settings |>> ", 892, 169, 227, 20, "Display game framing settings"); + uiDefIconTextBlockBut(block, framing_render_menu, NULL, ICON_BLOCKBUT_CORNER, "Game framing settings", 892, 169, 227, 20, "Display game framing settings"); uiBlockBeginAlign(block); uiDefButS(block, NUM,REDRAWVIEWCAM,"SizeX:", 892 ,136,112,27, &G.scene->r.xsch, 4.0, 10000.0, 0, 0, "The image width in pixels"); diff --git a/source/blender/src/drawscript.c b/source/blender/src/drawscript.c index e94834f5c7b..1ab13355f70 100644 --- a/source/blender/src/drawscript.c +++ b/source/blender/src/drawscript.c @@ -120,7 +120,7 @@ void winqreadscriptspace(struct ScrArea *sa, void *spacedata, struct BWinEvent * } else { if (event == QKEY) - if (val && okee("QUIT BLENDER")) exit_usiblender(); + if (val && okee("Quit Blender")) exit_usiblender(); } return; diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index 7ec357637a3..1806732e919 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -678,8 +678,8 @@ void txt_write_file(Text *text) /* Should we ask to save over? */ if (text->flags & TXT_ISTMP) { if (BLI_exists(text->name)) { - if (!okee("Save over?")) return; - } else if (!okee("Create new file?")) return; + if (!okee("Save over")) return; + } else if (!okee("Create new file")) return; text->flags ^= TXT_ISTMP; } @@ -996,7 +996,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) allqueue(REDRAWHEADERS, 0); break; case 1: - activate_fileselect(FILE_SPECIAL, "LOAD TEXT FILE", G.sce, add_text_fs); + activate_fileselect(FILE_SPECIAL, "Open Text File", G.sce, add_text_fs); break; } } @@ -1011,12 +1011,12 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) allqueue(REDRAWHEADERS, 0); break; case 1: - activate_fileselect(FILE_SPECIAL, "LOAD TEXT FILE", G.sce, add_text_fs); + activate_fileselect(FILE_SPECIAL, "Open Text File", G.sce, add_text_fs); break; } } else if (event==QKEY) { - if(okee("QUIT BLENDER")) exit_usiblender(); + if(okee("Quit Blender")) exit_usiblender(); } else if (event==NKEY) { if (G.qual & LR_ALTKEY) { @@ -1029,7 +1029,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } else if (event==OKEY) { if (G.qual & LR_ALTKEY) { - activate_fileselect(FILE_SPECIAL, "LOAD TEXT FILE", G.sce, add_text_fs); + activate_fileselect(FILE_SPECIAL, "Open Text File", G.sce, add_text_fs); } } } @@ -1067,7 +1067,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case 1: - activate_fileselect(FILE_SPECIAL, "LOAD TEXT FILE", G.sce, add_text_fs); + activate_fileselect(FILE_SPECIAL, "Open Text File", G.sce, add_text_fs); break; case 3: @@ -1156,7 +1156,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) allqueue(REDRAWHEADERS, 0); break; case 1: - activate_fileselect(FILE_SPECIAL, "LOAD TEXT FILE", G.sce, add_text_fs); + activate_fileselect(FILE_SPECIAL, "Open Text File", G.sce, add_text_fs); break; case 3: text->flags |= TXT_ISMEM; @@ -1202,7 +1202,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; /* BREAK N */ case OKEY: if (G.qual == LR_ALTKEY) { - activate_fileselect(FILE_SPECIAL, "LOAD TEXT FILE", G.sce, add_text_fs); + activate_fileselect(FILE_SPECIAL, "Open Text File", G.sce, add_text_fs); } break; /* BREAK O */ case PKEY: @@ -1212,13 +1212,13 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } break; /* BREAK P */ case QKEY: - if(okee("QUIT BLENDER")) exit_usiblender(); + if(okee("Quit Blender")) exit_usiblender(); break; /* BREAK Q */ case RKEY: if (G.qual == LR_ALTKEY) { if (text->compiled) BPY_free_compiled_text(text); text->compiled = NULL; - if (okee("Reopen Text")) { + if (okee("Reopen text")) { if (!reopen_text(text)) error("Could not reopen file"); } diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 5069b5b5955..96a09783630 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1320,9 +1320,9 @@ void do_viewbuts(unsigned short event) else name= G.ima; if(G.qual==LR_CTRLKEY) - activate_imageselect(FILE_SPECIAL, "SELECT IMAGE", name, load_bgpic_image); + activate_imageselect(FILE_SPECIAL, "Select Image", name, load_bgpic_image); else - activate_fileselect(FILE_SPECIAL, "SELECT IMAGE", name, load_bgpic_image); + activate_fileselect(FILE_SPECIAL, "Select Image", name, load_bgpic_image); break; case B_BLENDBGPIC: diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index d30f13966ea..03db15ece84 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -1193,7 +1193,7 @@ void mergemenu(void) extern float doublimit; short event; - event = pupmenu("MERGE %t|At Center%x1|At Cursor%x2"); + event = pupmenu("Merge %t|At Center%x1|At Cursor%x2"); if (event==-1) return; /* Return if the menu is closed without any choices */ @@ -1204,7 +1204,7 @@ void mergemenu(void) else snap_sel_to_curs(); /*Merge at Cursor*/ - notice("Removed: %d", removedoublesflag(1, doublimit)); + notice("Removed %d Vertices", removedoublesflag(1, doublimit)); allqueue(REDRAWVIEW3D, 0); countall(); } @@ -1226,10 +1226,9 @@ void duplicate_context_selected(void) { else if(G.obedit->type==OB_MBALL) adduplicate_mball(); else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) adduplicate_nurb(); } - else if(G.obpose){ - error ("Duplicate not possible in posemode."); + else if(!(G.obpose)){ + adduplicate(0); } - else adduplicate(0); } void toggle_shading(void) { diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index beb5a521589..1f3f5266e29 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -160,12 +160,12 @@ bAction* bake_action_with_client (bAction *act, Object *armob, float tolerance) if (G.obedit){ - error ("Not in editmode"); + error ("Actions can't be baked in Edit Mode"); return NULL; } if (!arm){ - error ("Must have an armature selected"); + error ("Select an armature before baking"); return NULL; } /* Get a new action */ @@ -236,7 +236,7 @@ bAction* bake_action_with_client (bAction *act, Object *armob, float tolerance) } } - notice ("Made new action \"%s\"", newname); + notice ("Made a new action named \"%s\"", newname); G.scene->r.cfra = oldframe; armob->action = temp; return result; @@ -799,7 +799,7 @@ void copy_posebuf (void) ob=G.obpose; if (!ob){ - error ("Copybuf is empty"); + error ("Copy buffer is empty"); return; } @@ -936,7 +936,7 @@ void paste_posebuf (int flip){ return; if (!g_posebuf){ - error ("Copybuf is empty"); + error ("Copy buffer is empty"); return; }; @@ -1061,7 +1061,7 @@ static void insertactionkey(bAction *act, bActionChannel *achan, bPoseChannel *c return; } if (act->id.lib){ - error ("Can't pose libactions"); + error ("Can't pose library actions"); return; } act->achan=achan; @@ -2179,9 +2179,9 @@ static void clever_keyblock_names(Key *key, short* mval){ add_numbut(but++, TEX, "KB: ", 0, 24, str, "Does this really need a tool tip?"); - add_numbut(but++, NUM|FLO, "Slider min:", + add_numbut(but++, NUM|FLO, "Slider Min:", -10000, kb->slidermax, &kb->slidermin, 0); - add_numbut(but++, NUM|FLO, "Slider max:", + add_numbut(but++, NUM|FLO, "Slider Max:", kb->slidermin, 10000, &kb->slidermax, 0); if (do_clever_numbuts(str, but, REDRAW)) { diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index 1c93316f718..19c743b4e2d 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -683,7 +683,7 @@ void delete_armature(void) EditBone *curBone, *next; TEST_EDITARMATURE; - if(okee("Erase selected")==0) return; + if(okee("Erase selected armature")==0) return; for (curBone=G.edbo.first;curBone;curBone=next){ next=curBone->next; @@ -732,7 +732,7 @@ static void delete_bone(EditBone* exBone) void remake_editArmature(void) { - if(okee("Reload Original data")==0) return; + if(okee("Reload original data")==0) return; make_editArmature(); allqueue(REDRAWVIEW3D, 0); @@ -1786,7 +1786,7 @@ void join_armature(void) if(ob->type!=OB_ARMATURE) return; /* Make sure the user wants to continue*/ - if(okee("Join selected Armatures")==0) return; + if(okee("Join selected armatures")==0) return; /* Put the active armature into editmode and join the bones from the other one*/ #if 1 @@ -1917,7 +1917,7 @@ void extrude_armature(void) TEST_EDITARMATURE; - if(okee("Extrude Bone Segments")==0) return; + if(okee("Extrude bone segments")==0) return; /* Duplicate the necessary bones */ for (curbone = G.edbo.first; ((curbone) && (curbone!=first)); curbone=curbone->next){ diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c index f8b1812d2b3..16fa866e070 100644 --- a/source/blender/src/editcurve.c +++ b/source/blender/src/editcurve.c @@ -366,7 +366,7 @@ void make_editNurb() void remake_editNurb() { - if(okee("Reload Original data")==0) return; + if(okee("Reload original data")==0) return; make_editNurb(); allqueue(REDRAWVIEW3D, 0); @@ -391,7 +391,7 @@ void separate_nurb() cu= G.obedit->data; if(cu->key) { - error("Can't separate with vertex keys"); + error("Can't separate a curve with vertex keys"); return; } @@ -2159,7 +2159,7 @@ void merge_2_nurb(Nurb *nu1, Nurb *nu2) } if( nu1->pntsv != nu2->pntsv ) { - error("resolution doesn't match"); + error("Resolution doesn't match"); return; } @@ -2234,7 +2234,7 @@ void merge_nurb() if(nsortbase.first == nsortbase.last) { BLI_freelistN(&nsortbase); - error("Too few selections"); + error("Too few selections to merge"); return; } @@ -2257,7 +2257,7 @@ void merge_nurb() } if(ok==0) { - error("resolution doesn't match"); + error("Resolution doesn't match"); BLI_freelistN(&nsortbase); return; } @@ -3011,8 +3011,8 @@ void delNurb() if(G.obedit==0 ) return; if( (G.vd->lay & G.obedit->lay)==0 ) return; - if(G.obedit->type==OB_SURF) event= pupmenu("ERASE %t|Selected%x0|All%x2"); - else event= pupmenu("ERASE %t|Selected%x0|Segment%x1|All%x2"); + if(G.obedit->type==OB_SURF) event= pupmenu("Erase %t|Selected%x0|All%x2"); + else event= pupmenu("Erase %t|Selected%x0|Segment%x1|All%x2"); if(event== -1) return; @@ -3288,9 +3288,9 @@ void join_curve(int type) tempbase.first= tempbase.last= 0; if(type==OB_SURF) { - if(okee("Join selected Nurbs")==0) return; + if(okee("Join selected NURBS")==0) return; } - else if(okee("Join selected Curves")==0) return; + else if(okee("Join selected curves")==0) return; /* trasnform all selected curves inverse in obact */ Mat4Invert(imat, ob->obmat); @@ -3924,7 +3924,7 @@ void clever_numbuts_curve() add_numbut(1, NUM|FLO, "LocY:", -G.vd->far, G.vd->far, bezt->vec[1]+1, 0); add_numbut(2, NUM|FLO, "LocZ:", -G.vd->far, G.vd->far, bezt->vec[1]+2, 0); VECCOPY(old, bezt->vec[1]); - do_clever_numbuts("Active BezierPoint", 3, REDRAW); + do_clever_numbuts("Active Bezier Point", 3, REDRAW); VecSubf(delta, bezt->vec[1], old); VecAddf(bezt->vec[0], bezt->vec[0], delta); @@ -3936,14 +3936,14 @@ void clever_numbuts_curve() add_numbut(1, NUM|FLO, "LocY:", -G.vd->far, G.vd->far, bezt->vec[0]+1, 0); add_numbut(2, NUM|FLO, "LocZ:", -G.vd->far, G.vd->far, bezt->vec[0]+2, 0); - do_clever_numbuts("Active HandlePoint", 3, REDRAW); + do_clever_numbuts("Active Handle Point", 3, REDRAW); } else if(bezt->f3 & 1) { add_numbut(0, NUM|FLO, "LocX:", -G.vd->far, G.vd->far, bezt->vec[2], 0); add_numbut(1, NUM|FLO, "LocY:", -G.vd->far, G.vd->far, bezt->vec[2]+1, 0); add_numbut(2, NUM|FLO, "LocZ:", -G.vd->far, G.vd->far, bezt->vec[2]+2, 0); - do_clever_numbuts("Active HandlePoint", 3, REDRAW); + do_clever_numbuts("Active Handle Point", 3, REDRAW); } } diff --git a/source/blender/src/editdeform.c b/source/blender/src/editdeform.c index 9d32ed8c93b..dfdfdf943cb 100644 --- a/source/blender/src/editdeform.c +++ b/source/blender/src/editdeform.c @@ -429,7 +429,7 @@ void assign_verts_defgroup (void) dg=BLI_findlink(&ob->defbase, ob->actdef-1); if (!dg){ - error ("No vertex group active"); + error ("No vertex group is active"); return; } @@ -522,7 +522,7 @@ void remove_verts_defgroup (int allverts) dg=BLI_findlink(&ob->defbase, ob->actdef-1); if (!dg){ - error ("No vertex group active"); + error ("No vertex group is active"); return; } diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index 96672ab6b2e..f2c6585d51e 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -778,7 +778,7 @@ void rotate_uv_tface() me= get_mesh(OBACT); if(me==0 || me->tface==0) return; - mode= pupmenu("OK? %t|Rot UV %x1|Rot VertexCol %x2"); + mode= pupmenu("Rotate %t|UV Co-ordinates %x1|Vertex Colors %x2"); if(mode<1) return; @@ -893,7 +893,7 @@ void face_select() /* Get the face under the cursor */ ob = OBACT; if (!(ob->lay & G.vd->lay)) { - error("Active object not in this layer!"); + error("The active object is not in this layer"); } me = get_mesh(ob); getmouseco_areawin(mval); @@ -1394,16 +1394,16 @@ void face_draw() error("No active object"); return; } if (!(ob->lay & G.vd->lay)) { - error("Active object not in this layer"); return; + error("The active object is not in this layer"); return; } me = get_mesh(ob); if (!me) { - error("Active object does not have a mesh"); return; + error("The active object does not have a mesh obData"); return; } brush = IMG_BrushCreate(Gvp.size, Gvp.size, Gvp.r, Gvp.g, Gvp.b, Gvp.a); if (!brush) { - error("Can not create brush"); return; + error("Can't create brush"); return; } persp(PERSP_VIEW); @@ -1516,7 +1516,7 @@ void face_draw() } if (warn_packed_file) { - error("Painting in packed images not supported: %s", warn_packed_file); + error("Painting in packed images is not supported: %s", warn_packed_file); } persp(PERSP_WIN); @@ -1543,7 +1543,7 @@ void get_same_uv(void) ob = OBACT; if (!(ob->lay & G.vd->lay)) { - error("Active object not in this layer!"); + error("The active object is not in this layer"); return; } me = get_mesh(ob); @@ -1565,7 +1565,7 @@ void get_same_uv(void) } if(!foundtex) { - error("No active face or active face has no UV-texture"); + error("No active face, or active face has no UV texture"); return; } diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c index 4e4671f6082..49f4169bfd0 100644 --- a/source/blender/src/editfont.c +++ b/source/blender/src/editfont.c @@ -595,7 +595,7 @@ void remake_editText(void) { Curve *cu; - if(okee("Reload Original text")==0) return; + if(okee("Reload original text")==0) return; BLI_strncpy(textbuf, oldstr, MAXTEXT); cu= G.obedit->data; diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c index d8e7b0453f9..8dcff8e4956 100644 --- a/source/blender/src/editimasel.c +++ b/source/blender/src/editimasel.c @@ -361,7 +361,7 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt) strcpy(name, simasel->dir); strcat(name, simasel->hilite_ima->file_name); - if( okee("Remove %s", name) ) { + if( okee("Delete %s", name) ) { ret = BLI_delete(name, 0, 0); if (ret) { error("Command failed, see console"); diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 28af4098d76..ae62978c63c 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -2105,7 +2105,7 @@ void add_vert_ipo() ei= get_editipo(); if(ei==0) { - error("Too many editipo's"); + error("Too many EditIpos"); return; } @@ -2621,7 +2621,7 @@ void mouse_select_ipo() if(actkb) { ok= TRUE; if(G.obedit && (actkb->flag & 1)==0) { - ok= okee("Copy Key after leaving EditMode"); + ok= okee("Copy key after leaving Edit Mode"); } if(ok) { /* also does all keypos */ @@ -3091,7 +3091,7 @@ void set_ipotype() key= (Key *)G.sipo->from; if(key==0) return; - event= pupmenu("Key Type %t|Linear %x1|Cardinal %x2|B spline %x3"); + event= pupmenu("Key Type %t|Linear %x1|Cardinal %x2|B Spline %x3"); if(event < 1) return; kb= key->block.first; @@ -3327,7 +3327,7 @@ void copy_editipo() } } - if(totipocopybuf==0) error("Copybuf is empty"); + if(totipocopybuf==0) error("Copy buffer is empty"); } void paste_editipo() @@ -3556,9 +3556,9 @@ void insertkey_editipo() short event; if(G.sipo->showkey) - event= pupmenu("Insert KeyVertices %t|Current frame %x1|Selected Keys %x2"); + event= pupmenu("Insert Key Vertices %t|Current Frame %x1|Selected Keys %x2"); else - event= pupmenu("Insert KeyVertices %t|Current frame %x1"); + event= pupmenu("Insert Key Vertices %t|Current Frame %x1"); if(event<1) return; @@ -3664,7 +3664,7 @@ void common_insertkey() id= G.buts->lockpoin; ma= G.buts->lockpoin; if(id) { - event= pupmenu("Insert Key %t|RGB%x0|Alpha%x1|HaSize%x2|Mode %x3|All Color%x10|Ofs%x12|Size%x13|All Mapping%x11"); + event= pupmenu("Insert Key %t|RGB%x0|Alpha%x1|Halo Size%x2|Mode %x3|All Color%x10|Ofs%x12|Size%x13|All Mapping%x11"); if(event== -1) return; map= texchannel_to_adrcode(ma->texact); @@ -3719,7 +3719,7 @@ void common_insertkey() id= G.buts->lockpoin; wo= G.buts->lockpoin; if(id) { - event= pupmenu("Insert Key %t|ZenRGB%x0|HorRGB%x1|Mist%x2|stars %x3|Ofs%x12|Size%x13"); + event= pupmenu("Insert Key %t|Zenith RGB%x0|Horizon RGB%x1|Mist%x2|Stars %x3|Offset%x12|Size%x13"); if(event== -1) return; map= texchannel_to_adrcode(wo->texact); @@ -3763,7 +3763,7 @@ void common_insertkey() id= G.buts->lockpoin; la= G.buts->lockpoin; if(id) { - event= pupmenu("Insert Key %t|RGB%x0|Energy%x1|Spotsi%x2|Ofs%x12|Size%x13"); + event= pupmenu("Insert Key %t|RGB%x0|Energy%x1|Spot Size%x2|Offset%x12|Size%x13"); if(event== -1) return; map= texchannel_to_adrcode(la->texact); @@ -5011,7 +5011,7 @@ void ipo_record() if(G.sipo->from==0) return; if(SFRA>=EFRA) return; - anim= pupmenu("Record Mouse %t|Still %x1|Play anim %x2"); + anim= pupmenu("Record Mouse %t|Still %x1|Play Animation %x2"); if(anim < 1) return; if(anim!=2) anim= 0; @@ -5027,7 +5027,7 @@ void ipo_record() if(ei1==0) ei1= ei; else if(ei2==0) ei2= ei; else { - error("Max 2 visible curves"); + error("Maximum 2 visible curves"); return; } } @@ -5120,7 +5120,7 @@ void ipo_record() sfra= MIN2(sfra, cfra); efra= MAX2(efra, cfra); } - else sprintf(str, "Mouse Recording. Use CTRL to start. LeftMouse or Space to end"); + else sprintf(str, "Mouse Recording. Use Ctrl to start. LeftMouse or Space to end"); do_ob_key(OBACT); diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c index bebf204d27d..cffe98cde4e 100644 --- a/source/blender/src/editkey.c +++ b/source/blender/src/editkey.c @@ -370,7 +370,7 @@ void insert_meshkey(Mesh *me, short offline) if (!offline) /* interactive */ rel = pupmenu("Insert Vertex Keys %t|" - "Relative keys %x1|Absolute keys %x2"); + "Relative Keys %x1|Absolute Keys %x2"); else /* we were called from a script */ rel = offline; diff --git a/source/blender/src/editlattice.c b/source/blender/src/editlattice.c index 634db966078..8aebfdfedc5 100644 --- a/source/blender/src/editlattice.c +++ b/source/blender/src/editlattice.c @@ -81,7 +81,7 @@ void apply_lattice(void) Base *base; Object *par; - if(okee("Apply Lattice Deform")==0) return; + if(okee("Apply lattice deformation")==0) return; base= FIRSTBASE; while(base) { @@ -221,7 +221,7 @@ void load_editLatt(void) void remake_editLatt(void) { - if(okee("Reload Original data")==0) return; + if(okee("Reload original data")==0) return; make_editLatt(); allqueue(REDRAWVIEW3D, 0); diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index c843be44943..289a511a8e8 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -1541,7 +1541,7 @@ void make_sticky(void) if(G.scene->camera==0) return; if(G.obedit) { - error("Unable to perform function in EditMode"); + error("Unable to make sticky in Edit Mode"); return; } base= FIRSTBASE; @@ -1690,7 +1690,7 @@ void convert_to_triface(int all) EditMesh *em = G.editMesh; EditVlak *evl, *evln, *next; - undo_push_mesh("Convert to triangles"); + undo_push_mesh("Convert Quads to Triangles"); evl= em->faces.first; while(evl) { @@ -1736,8 +1736,8 @@ void deselectall_mesh(void) /* toggle */ eve= eve->next; } - if (a) undo_push_mesh("Deselect all"); - else undo_push_mesh("Select all"); + if (a) undo_push_mesh("Deselect All"); + else undo_push_mesh("Select All"); eve= em->verts.first; while(eve) { @@ -2214,8 +2214,8 @@ void loopoperations(char mode) if ((G.obedit==0) || (em->faces.first==0)) return; - if(mode==LOOP_CUT)undo_push_mesh("Faceloop Subdivide"); - else if(mode==LOOP_SELECT)undo_push_mesh("Faceloop Select"); + if(mode==LOOP_CUT)undo_push_mesh("Face Loop Subdivide"); + else if(mode==LOOP_SELECT)undo_push_mesh("Select Face Loop"); SetBlenderCursor(BC_VLOOPCURSOR); @@ -3240,7 +3240,7 @@ void edge_select(void) if( (G.qual & LR_SHIFTKEY)==0) { EditVert *eve; - undo_push_mesh("Edge select"); + undo_push_mesh("Select Edge"); /* deselectall */ for(eve= em->verts.first; eve; eve= eve->next) eve->f&= ~1; @@ -3339,7 +3339,7 @@ void mouse_mesh(void) glDrawBuffer(GL_FRONT); - undo_push_mesh("Vertex select"); + undo_push_mesh("Select Vertex"); if( (act->f & 1)==0) act->f+= 1; else if(G.qual & LR_SHIFTKEY) act->f-= 1; @@ -3430,11 +3430,11 @@ void selectconnected_mesh(int qual) act= findnearestvert(sel-2); if(act==0) { - error(" Nothing indicated "); + error("Nothing indicated "); return; } - undo_push_mesh("Select linked"); + undo_push_mesh("Select Linked"); /* clear test flags */ eve= em->verts.first; while(eve) { @@ -4888,7 +4888,7 @@ void extrude_mesh(void) a= extrudeflag(1,1); waitcursor(0); if(a==0) { - error("No valid vertices selected"); + error("No valid vertices are selected"); } else { countall(); /* for G.totvert in calc_meshverts() */ @@ -4937,7 +4937,7 @@ void separatemenu(void) { short event; - event = pupmenu("Separate (No undo!) %t|Selected%x1|All loose parts%x2"); + event = pupmenu("Separate (No undo!) %t|Selected%x1|All Loose Parts%x2"); if (event==0) return; waitcursor(1); @@ -5125,7 +5125,7 @@ void separate_mesh_loose(void) me= get_mesh(G.obedit); if(me->key) { - error("Can't separate with vertex keys"); + error("Can't separate a mesh with vertex keys"); return; } @@ -5316,7 +5316,7 @@ void extrude_repeat_mesh(int steps, float offs) for(a=0;aview!=1) { - error("Only in frontview!"); + error("Must be in Front View"); return; } @@ -5463,7 +5463,7 @@ void screw_mesh(int steps,int turns) eve= eve->next; } if(v1==0 || v2==0) { - error("No curve selected"); + error("No curve is selected"); return; } @@ -5576,7 +5576,7 @@ void addedgevlak_mesh(void) return; } if(aantal<2 || aantal>4) { - error("Can't make edge/face"); + error("Incorrect number of vertices to make edge/face"); return; } @@ -5588,7 +5588,7 @@ void addedgevlak_mesh(void) evl= addvlaklist(neweve[0], neweve[1], neweve[2], 0, NULL); } - else error("Already a face"); + else error("The selected vertices already form a face"); } else if(aantal==4) { if(exist_vlak(neweve[0], neweve[1], neweve[2], neweve[3])==0) { @@ -5605,7 +5605,7 @@ void addedgevlak_mesh(void) evl= addvlaklist(neweve[0], neweve[2], neweve[1], neweve[3], NULL); } - else error("Already a face"); + else error("The selected vertices already form a face"); } if(evl) { // now we're calculating direction of normal @@ -5681,7 +5681,7 @@ void delete_mesh(void) TEST_EDITMESH - event= pupmenu("ERASE %t|Vertices%x10|Edges%x1|Faces%x2|All%x3|Edges & Faces%x4|Only Faces%x5"); + event= pupmenu("Erase %t|Vertices%x10|Edges%x1|Faces%x2|All%x3|Edges & Faces%x4|Only Faces%x5"); if(event<1) return; if(event==10 ) { @@ -6642,13 +6642,13 @@ void join_triangles(void) totedge = count_edges(em->edges.first); if(totedge==0) return; - undo_push_mesh("Join triangles"); + undo_push_mesh("Convert Triangles to Quads"); evlar= (EVPTuple *) MEM_callocN(totedge * sizeof(EVPTuple), "jointris"); ok = collect_quadedges(evlar, em->edges.first, em->faces.first); if (G.f & G_DEBUG) { - printf("edges selected: %d\n", ok); + printf("Edges selected: %d\n", ok); } eed= em->edges.first; @@ -6738,7 +6738,7 @@ void edge_flip(void) totedge = count_edges(em->edges.first); if(totedge==0) return; - undo_push_mesh("Flip edges"); + undo_push_mesh("Flip Triangle Edges"); /* temporary array for : edge -> face[1], face[2] */ evlar= (EVPTuple *) MEM_callocN(totedge * sizeof(EVPTuple), "edgeflip"); @@ -6846,7 +6846,7 @@ void beauty_fill(void) totedge = count_edges(em->edges.first); if(totedge==0) return; - if(okee("Beauty Fill")==0) return; + if(okee("Beauty fill")==0) return; undo_push_mesh("Beauty Fill"); @@ -7054,7 +7054,7 @@ void join_mesh(void) } if(haskey) { - error("Join with vertex keys not supported"); + error("Can't join meshes with vertex keys"); return; } /* that way the active object is always selected */ @@ -7062,7 +7062,7 @@ void join_mesh(void) if(totvert==0 || totvert>MESH_MAX_VERTS) return; - if(okee("Join selected Meshes")==0) return; + if(okee("Join selected meshes")==0) return; /* new material indices and material array */ matar= MEM_callocN(sizeof(void *)*MAXMAT, "join_mesh"); @@ -7371,7 +7371,7 @@ void sort_faces(void) if(G.obedit) return; if(ob->type!=OB_MESH) return; - if(okee("Sort Faces in Z")==0) return; + if(okee("Sort faces in Z axis")==0) return; me= ob->data; if(me->totface==0) return; @@ -8344,7 +8344,7 @@ void undo_pop_mesh(int steps) /* steps == 1 is one step */ allqueue(REDRAWVIEW3D, 0); makeDispList(G.obedit); G.undo_edit_level--; - } else error("Can't undo"); + } else error("No more steps to undo"); } @@ -8357,7 +8357,7 @@ void undo_redo_mesh(void) make_editMesh_real((Mesh*)G.undo_edit[G.undo_edit_level+1].datablock); allqueue(REDRAWVIEW3D, 0); makeDispList(G.obedit); - } else error("Can't redo"); + } else error("No more steps to redo"); } void undo_clear_mesh(void) @@ -8383,7 +8383,7 @@ void undo_menu_mesh(void) TEST_EDITMESH - strcpy(menu, "UNDO %t|%l"); + strcpy(menu, "Undo %t|%l"); strcat(menu, "|All changes%x1|%l"); for (i=G.undo_edit_level; i>=0; i--) { @@ -9103,7 +9103,7 @@ void bevel_menu() window_to_3d(centre, mval[0], mval[1]); - if(button(&recurs, 1, 4, "Recurs:")==0) return; + if(button(&recurs, 1, 4, "Recursion:")==0) return; for (nr=0; nredges.first;search;search=search->next) numEdges++; diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c index c4f85c1ef5d..66dc645f4e7 100644 --- a/source/blender/src/editnla.c +++ b/source/blender/src/editnla.c @@ -278,7 +278,7 @@ static void convert_nla(short mval[2]) return; if (base->object->type==OB_ARMATURE){ - event = pupmenu("Convert%t|Action to NLAstrip%x1"); + event = pupmenu("Convert%t|Action to NLA Strip%x1"); switch (event){ case 1: if (base->object->action){ @@ -428,12 +428,12 @@ static void add_nlablock(short mval[2]) /* Make sure we have an armature */ if (!base){ - error ("Not an armature!"); + error ("Not an armature"); return; } /* Popup action menu */ - IDnames_to_pupstring(&str, "Add action", NULL, &G.main->action, (ID *)G.scene, &nr); + IDnames_to_pupstring(&str, "Add Action", NULL, &G.main->action, (ID *)G.scene, &nr); if(strncmp(str+13, "DataBrow", 8)==0) { MEM_freeN(str); @@ -1536,8 +1536,8 @@ void clever_numbuts_nla(void){ add_numbut(but++, NUM|FLO, "Action Start:", 1.0, 18000.0, &strip->actstart, "First frame of the action to map to the playrange"); add_numbut(but++, NUM|FLO, "Action End:", 1.0, 18000.0, &strip->actend, "Last frame of the action to map to the playrange"); add_numbut(but++, LABEL, "Blending:", 1.0, 18000.0, 0, 0); - add_numbut(but++, NUM|FLO, "Blendin:", 0.0, 18000.0, &strip->blendin, "Number of frames of ease-in"); - add_numbut(but++, NUM|FLO, "Blendout:", 0.0, 18000.0, &strip->blendout, "Number of frames of ease-out"); + add_numbut(but++, NUM|FLO, "Blend In:", 0.0, 18000.0, &strip->blendin, "Number of frames of ease-in"); + add_numbut(but++, NUM|FLO, "Blend Out:", 0.0, 18000.0, &strip->blendout, "Number of frames of ease-out"); add_numbut(but++, LABEL, "Options:", 1.0, 18000.0, 0, 0); add_numbut(but++, NUM|FLO, "Repeat:", 0.0001, 18000.0, &strip->repeat, "Number of times the action should repeat"); add_numbut(but++, NUM|FLO, "Stride:", 0.0001, 1000.0, &strip->stridelen, "Distance covered by one complete cycle of the action specified in the Action Range"); diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index e28c43cb948..7edf910816b 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -236,7 +236,7 @@ extern int undo_push(char *); Base *nbase= base->next; if TESTBASE(base) { - if(ok==0 && (ok=okee("ERASE SELECTED"))==0) return; + if(ok==0 && (ok=okee("Erase selected"))==0) return; free_and_unlink_base(base); } @@ -362,7 +362,7 @@ void clear_parent(void) if(G.obedit) return; if(G.scene->id.lib) return; - mode= pupmenu("OK? %t|Clear Parent %x1| ... and keep transform (clr track) %x2|Clear parent inverse %x3"); + mode= pupmenu("OK? %t|Clear Parent %x1|Clear and Keep Transformation (Clear Track) %x2|Clear Parent Inverse %x3"); if(mode<1) return; @@ -409,7 +409,7 @@ void clear_track(void) if(G.obedit) return; if(G.scene->id.lib) return; - mode= pupmenu("OK? %t|Clear Track %x1| ... and keep transform %x2"); + mode= pupmenu("OK? %t|Clear Track %x1| Clear Track and Keep Transform %x2"); if(mode<1) return; @@ -519,7 +519,7 @@ void set_slowparent(void) { Base *base; - if( okee("Set Slow parent")==0 ) return; + if( okee("Set slow parent")==0 ) return; base= FIRSTBASE; while(base) { @@ -594,7 +594,7 @@ void make_vertex_parent(void) } if( !(v1 && v2==0 && v3==0) && !(v1 && v2 && v3) ) { - error("select 1 or 3 vertices"); + error("Select either 1 or 3 vertices to parent to"); return; } @@ -687,7 +687,7 @@ void make_parent(void) if(par->type==OB_IKA) { if(qual & LR_SHIFTKEY) - mode= pupmenu("Make Parent without inverse%t|Use Vertex %x1|Use Limb %x2|Use Skeleton %x3"); + mode= pupmenu("Make Parent Without Inverse%t|Use Vertex %x1|Use Limb %x2|Use Skeleton %x3"); else mode= pupmenu("Make Parent %t|Use Vertex %x1|Use Limb %x2|Use Skeleton %x3"); @@ -724,7 +724,7 @@ void make_parent(void) if TESTBASELIB(base) { if(base->object->type==OB_IKA && base->object!=par && mode==PARVERT1 ) { if(effchild==0) { - if(okee("Effector as Child")) effchild= 1; + if(okee("Effector as child")) effchild= 1; else effchild= 2; } } @@ -831,13 +831,13 @@ void make_parent(void) } else { if(qual & LR_SHIFTKEY) { - if(okee("Make Parent without inverse")==0) return; + if(okee("Make parent without inverse")==0) return; } else { if(qual & LR_ALTKEY) { - if(okee("Make VertexParent")==0) return; + if(okee("Make vertex parent")==0) return; } - else if(okee("Make Parent")==0) return; + else if(okee("Make parent")==0) return; /* test effchild */ base= FIRSTBASE; @@ -991,7 +991,7 @@ void enter_editmode(void) id= ob->data; if(id->lib) { - error("Can't edit libdata"); + error("Can't edit library data"); return; } @@ -999,7 +999,7 @@ void enter_editmode(void) me= get_mesh(ob); if( me==0 ) return; if(me->id.lib) { - error("Can't edit libdata"); + error("Can't edit library data"); return; } ok= 1; @@ -1012,7 +1012,7 @@ void enter_editmode(void) arm=base->object->data; if (!arm) return; if (arm->id.lib){ - error("Can't edit libdata"); + error("Can't edit library data"); return; } ok=1; @@ -1091,7 +1091,7 @@ void exit_editmode(int freedata) /* freedata==0 at render */ countall(); if(G.totvert>MESH_MAX_VERTS) { - error("too many vertices"); + error("Too many vertices"); return; } load_editMesh(); /* makes new displist */ @@ -1239,7 +1239,7 @@ void docentre(void) if(G.obedit==0 && (me=get_mesh(base->object)) ) { if(me->key) { - error("Mesh with vertexkey!"); + error("Can't change the center of a mesh with vertex keys"); return; } @@ -1412,7 +1412,7 @@ void docentre_new(void) if(G.scene->id.lib) return; if(G.obedit) { - error("Unable to perform function in EditMode"); + error("Unable to center new in Edit Mode"); } else { centremode= 1; @@ -1426,7 +1426,7 @@ void docentre_cursor(void) if(G.scene->id.lib) return; if(G.obedit) { - error("Unable to perform function in EditMode"); + error("Unable to center cursor in Edit Mode"); } else { centremode= 2; @@ -1569,7 +1569,7 @@ void special_editmenu(void) if (ret==0) { error("An internal error occurred -- sorry!"); } else if(ret==-1) { - error("Boolean ops with faceless meshes is not allowed"); + error("Selected meshes must have faces to perform boolean operations"); } waitcursor(0); @@ -1587,7 +1587,7 @@ void special_editmenu(void) } else if(G.obedit->type==OB_MESH) { - nr= pupmenu("Specials%t|Subdivide%x1|Subdivide Fractal%x2|Subdivide Smooth%x3|Merge%x4|Remove Doubles%x5|Hide%x6|Reveal%x7|Select swap%x8|Flip Normals %x9|Smooth %x10|Bevel %x11"); + nr= pupmenu("Specials%t|Subdivide%x1|Subdivide Fractal%x2|Subdivide Smooth%x3|Merge%x4|Remove Doubles%x5|Hide%x6|Reveal%x7|Select Swap%x8|Flip Normals %x9|Smooth %x10|Bevel %x11"); if(nr>0) waitcursor(1); switch(nr) { @@ -1610,8 +1610,8 @@ void special_editmenu(void) mergemenu(); break; case 5: - undo_push_mesh("Rem Doubles"); - notice("Removed: %d", removedoublesflag(1, doublimit)); + undo_push_mesh("Remove Doubles"); + notice("Removed %d Vertices", removedoublesflag(1, doublimit)); break; case 6: hide_mesh(0); @@ -1682,7 +1682,7 @@ void convertmenu(void) if(nr>0) ok= 1; } else if(ob->type==OB_MBALL) { - nr= pupmenu("Convert MetaBall to%t|Mesh (keep original)"); + nr= pupmenu("Convert Metaball to%t|Mesh (keep original)"); if(nr>0) ok= 1; } else if(ob->type==OB_CURVE) { @@ -1690,11 +1690,11 @@ void convertmenu(void) if(nr>0) ok= 1; } else if(ob->type==OB_SURF) { - nr= pupmenu("Convert Nurbs Surf to%t|Mesh"); + nr= pupmenu("Convert Nurbs Surface to%t|Mesh"); if(nr>0) ok= 1; } else if(ob->type==OB_MESH && mesh_uses_displist((Mesh*) ob->data)) { - nr= pupmenu("Convert SubSurf to%t|Mesh (keep original)"); + nr= pupmenu("Convert SubSurf to%t|Mesh (Keep Original)"); if(nr>0) ok= 1; } if(ok==0) return; @@ -1872,7 +1872,7 @@ void copymenu_properties(Object *ob) } if(tot==0) { - error("No properties in Object"); + error("No properties in the active object to copy"); return; } @@ -2274,7 +2274,7 @@ void make_links(short event) sce= sce->id.next; } if(sce==G.scene) { - error("This is current scene"); + error("This is the current scene"); return; } if(sce==0 || sce->id.lib) return; @@ -2400,7 +2400,7 @@ void make_duplilist_real() Object *ob; extern ListBase duplilist; - if(okee("Make dupli's real")==0) return; + if(okee("Make dupli objects real")==0) return; base= FIRSTBASE; while(base) { @@ -2469,7 +2469,7 @@ void apply_object() return; } - if(okee("Apply size/rot")==0) return; + if(okee("Apply size and rotation")==0) return; base= FIRSTBASE; while(base) { @@ -2481,11 +2481,11 @@ void apply_object() me= ob->data; if(me->id.us>1) { - error("Can't do multi user mesh"); + error("Can't apply to a multi user mesh"); return; } if(me->key) { - error("Can't do key && mesh"); + error("Can't apply to a mesh with vertex keys"); return; } @@ -2512,7 +2512,7 @@ void apply_object() object_to_mat3(ob, mat); arm= ob->data; if(arm->id.us>1) { - error("Can't do multi user armature"); + error("Can't apply to a multi user armature"); return; } @@ -2529,11 +2529,11 @@ void apply_object() cu= ob->data; if(cu->id.us>1) { - error("Can't do multi user curve"); + error("Can't apply to a multi user curve"); return; } if(cu->key) { - error("Can't do keys"); + error("Can't apply to a curve with vertex keys"); return; } @@ -4438,9 +4438,9 @@ static char *transform_mode_to_string(int mode) case 'g': return("Grab"); break; case 's': return("Scale"); break; case 'r': return("Rotate"); break; - case 'G': return("Grab proportional"); break; - case 'C': return("Scale proportional"); break; - case 'R': return("Rotate proportional"); break; + case 'G': return("Grab Proportional"); break; + case 'C': return("Scale Proportional"); break; + case 'R': return("Rotate Proportional"); break; case 'S': return("Shear"); break; case 'N': return("Shrink/Fatten"); break; case 'w': return("Warp"); break; @@ -4668,7 +4668,7 @@ void transform(int mode) } if((mode=='r' || mode=='s' || mode=='S') && xc==32000) { - error("centre far out of view"); + error("Centre far out of view"); fout= 1; } @@ -7079,7 +7079,7 @@ void select_select_keys(void) if(G.scene->id.lib) return; - if(okee("show and select all keys")==0) return; + if(okee("Show and select all keys")==0) return; base= FIRSTBASE; while(base) { @@ -7200,7 +7200,7 @@ void texspace_edit(void) return; } - nr= pupmenu("Texture space %t|Grabber%x1|Size%x2"); + nr= pupmenu("Texture Space %t|Grab/Move%x1|Size%x2"); if(nr<1) return; base= FIRSTBASE; @@ -7226,7 +7226,7 @@ void first_base(void) /* inserts selected Bases in beginning of list, sometimes useful for operation order */ Base *base, *next; - if(okee("make first base")==0) return; + if(okee("Make first base")==0) return; base= FIRSTBASE; while(base) { @@ -7454,7 +7454,7 @@ void mirrormenu(void){ mirror_object(mode); /* separating functionality from interface | call*/ } else { - mode=pupmenu("Mirror Axis %t|X Global%x1|Y Global%x2|Z Global%x3|%l|X Local%x4|Y local%x5|Z Local%x6|%l|X View%x7|Y View%x8|Z View%x9|"); + mode=pupmenu("Mirror Axis %t|X Global%x1|Y Global%x2|Z Global%x3|%l|X Local%x4|Y Local%x5|Z Local%x6|%l|X View%x7|Y View%x8|Z View%x9|"); if (mode==-1) return; /* return */ mirror_edit(mode); /* separating functionality from interface | call*/ diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index a9d39bd8eb7..873a709fc93 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -664,9 +664,9 @@ static void screen_edge_edit_event(ScrArea *actarea, ScrEdge *actedge, short evt int edgeop; if (!actarea->headertype) { - edgeop= pupmenu("Split Area|Join Areas|Add header"); + edgeop= pupmenu("Split Area|Join Areas|Add Header"); } else { - edgeop= pupmenu("Split Area|Join Areas|No header"); + edgeop= pupmenu("Split Area|Join Areas|No Header"); } if (edgeop==1) { @@ -1058,7 +1058,7 @@ void screenmain(void) else if (event==QKEY) { if((G.obedit && G.obedit->type==OB_FONT && g_activearea->spacetype==SPACE_VIEW3D)||g_activearea->spacetype==SPACE_TEXT||g_activearea->spacetype==SPACE_SCRIPT); else { - if(val && okee("QUIT BLENDER")) exit_usiblender(); + if(val && okee("Quit Blender")) exit_usiblender(); towin= 0; } } @@ -2842,7 +2842,7 @@ int select_area(int spacetype) G.curscreen->winakt= sa->win; areawinset(G.curscreen->winakt); } else { - error("wrong window"); + error("Wrong window"); return 0; } } diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index 2d113230272..adc31eb0b52 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -296,7 +296,7 @@ static void shuffle_seq(Sequence *test) calc_sequence(test); while( test_overlap_seq(test) ) { if(test->machine >= MAXSEQ) { - error("No space to add sequence "); + error("There is no more space to add a sequence strip"); BLI_remlink(ed->seqbasep, test); free_sequence(test); @@ -520,7 +520,7 @@ static void sfile_to_mv_sequence(SpaceFile *sfile, int cfra, int machine) /* is it a movie? */ anim = openanim(str, IB_rect); if(anim==0) { - error("Not a movie"); + error("The selected file is not a movie"); return; } @@ -574,7 +574,7 @@ static Sequence *sfile_to_snd_sequence(SpaceFile *sfile, int cfra, int machine) return 0; } if (sound->sample->bits != 16) { - error("Only 16 bit audio supported"); + error("Only 16 bit audio is supported"); return 0; } sound->id.us=1; @@ -857,7 +857,7 @@ static int add_seq_effect(int type) seq= ed->seqbasep->first; while(seq) { if(seq->flag & SELECT) { - if (seq->type == SEQ_SOUND) { error("Cannot apply effects to audio sequence"); return 0; } + if (seq->type == SEQ_SOUND) { error("Can't apply effects to audio sequence strips"); return 0; } if(seq != seq2) { if(seq1==0) seq1= seq; else if(seq3==0) seq3= seq; @@ -872,7 +872,7 @@ static int add_seq_effect(int type) if(type==10) { /* plugin: minimal 1 select */ if(seq2==0) { - error("Need minimum one active sequence"); + error("Need at least one selected sequence strip"); return 0; } if(seq1==0) seq1= seq2; @@ -880,7 +880,7 @@ static int add_seq_effect(int type) } else { if(seq1==0 || seq2==0) { - error("Need 2 selected sequences"); + error("Need 2 selected sequence strips"); return 0; } if(seq3==0) seq3= seq2; @@ -1000,7 +1000,7 @@ void add_sequence(int type) } } else { - event= pupmenu("Add sequence%t|Images%x1|Movie%x102|Audio%x103|Scene%x101|Plugin%x10|Cross%x2|GammaCross%x3|Add%x4|Sub%x5|Mul%x6|AlphaOver%x7|AlphaUnder%x8|AlphaOverDrop%x9"); + event= pupmenu("Add Sequence Strip%t|Images%x1|Movie%x102|Audio%x103|Scene%x101|Plugin%x10|Cross%x2|Gamma Cross%x3|Add%x4|Sub%x5|Mul%x6|Alpha Over%x7|Alpha Under%x8|Alpha Over Drop%x9"); } if(event<1) return; @@ -1014,11 +1014,11 @@ void add_sequence(int type) switch(event) { case 1: - activate_fileselect(FILE_SPECIAL, "SELECT IMAGES", last_imagename, add_image_strips); + activate_fileselect(FILE_SPECIAL, "Select Images", last_imagename, add_image_strips); break; case 102: - activate_fileselect(FILE_SPECIAL, "SELECT MOVIE", last_imagename, add_movie_strip); + activate_fileselect(FILE_SPECIAL, "Select Movie", last_imagename, add_movie_strip); break; case 101: /* new menu: */ @@ -1071,9 +1071,9 @@ void add_sequence(int type) case 9: case 10: - if(last_seq==0) error("Need minimum one active sequence"); + if(last_seq==0) error("Need at least one active sequence strip"); else if(event==10) { - activate_fileselect(FILE_SPECIAL, "SELECT PLUGIN", U.plugseqdir, load_plugin_seq); + activate_fileselect(FILE_SPECIAL, "Select Plugin", U.plugseqdir, load_plugin_seq); } else { if( add_seq_effect(event) ) transform_seq('g'); @@ -1082,7 +1082,7 @@ void add_sequence(int type) break; case 103: if (!last_sounddir[0]) strcpy(last_sounddir, U.sounddir); - activate_fileselect(FILE_SPECIAL, "SELECT WAV", last_sounddir, add_sound_strip); + activate_fileselect(FILE_SPECIAL, "Select Wav", last_sounddir, add_sound_strip); break; } } @@ -1095,7 +1095,7 @@ void change_sequence(void) if(last_seq==0) return; if(last_seq->type & SEQ_EFFECT) { - event= pupmenu("Change effect%t|Switch a-b %x1|Switch b-c %x10|Plugin%x11|Recalculate%x12|Cross%x2|GammaCross%x3|Add%x4|Sub%x5|Mul%x6|AlphaOver%x7|AlphaUnder%x8|AlphaOverdrop%x9"); + event= pupmenu("Change Effect%t|Switch A <-> B %x1|Switch B <-> C %x10|Plugin%x11|Recalculate%x12|Cross%x2|Gamma Cross%x3|Add%x4|Sub%x5|Mul%x6|Alpha Over%x7|Alpha Under%x8|Alpha Over Drop%x9"); if(event>0) { if(event==1) { SWAP(Sequence *, last_seq->seq1, last_seq->seq2); @@ -1104,7 +1104,7 @@ void change_sequence(void) SWAP(Sequence *, last_seq->seq2, last_seq->seq3); } else if(event==11) { - activate_fileselect(FILE_SPECIAL, "SELECT PLUGIN", U.plugseqdir, change_plugin_seq); + activate_fileselect(FILE_SPECIAL, "Select Plugin", U.plugseqdir, change_plugin_seq); } else if(event==12); /* recalculate: only new_stripdata */ else { @@ -1119,7 +1119,7 @@ void change_sequence(void) } else if(last_seq->type == SEQ_IMAGE) { if(okee("Change images")) { - activate_fileselect(FILE_SPECIAL, "SELECT IMAGES", last_imagename, reload_image_strip); + activate_fileselect(FILE_SPECIAL, "Select Images", last_imagename, reload_image_strip); } } else if(last_seq->type == SEQ_MOVIE) { @@ -1408,7 +1408,7 @@ void touch_seq_files(void) ed= G.scene->ed; if(ed==0) return; - if(okee("Touch & print selected Movies")==0) return; + if(okee("Touch and print selected movies")==0) return; waitcursor(1); @@ -1494,13 +1494,13 @@ void make_meta(void) while(seq) { if(seq->flag & SELECT) { tot++; - if (seq->type == SEQ_SOUND) { error("Cannot make Meta from audio"); return; } + if (seq->type == SEQ_SOUND) { error("Can't make Meta Strip from audio"); return; } } seq= seq->next; } if(tot < 2) return; - if(okee("Make Meta")==0) return; + if(okee("Make Meta Strip")==0) return; /* test relationships */ seq= ed->seqbasep->first; @@ -1521,7 +1521,7 @@ void make_meta(void) seq= seq->next; } if(tot==0) { - error("Select all related strips"); + error("Please select all related strips"); return; } diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 3bc6dff4b90..9e3558be259 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -113,7 +113,7 @@ int is_uv_tface_editing_allowed_silent(void) int is_uv_tface_editing_allowed(void) { - if(G.obedit) error("Unable to perform function in EditMode"); + if(G.obedit) error("Unable to perform action in Edit Mode"); return is_uv_tface_editing_allowed_silent(); } diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index bfaabd14b1f..d9ce29fad14 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -4232,7 +4232,7 @@ short pupmenu(char *instr) if(strncmp(laststring, instr, UI_MAX_NAME_STR-1)!=0) lastselected= 0; BLI_strncpy(laststring, instr, UI_MAX_NAME_STR); - startx= mval[0]-width/2; + startx= mval[0]-(0.8*(width)); if(lastselected>=0 && lastselectednitems) { starty= mval[1]-height+boxh/2+lastselected*boxh; } diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c index f97b2b9de2e..818c4f889c9 100644 --- a/source/blender/src/seqaudio.c +++ b/source/blender/src/seqaudio.c @@ -127,7 +127,7 @@ void audio_mixdown() if(file == -1) { - error("Cannot open output file!"); + error("Can't open output file"); return; } diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 040de8e66bf..128d1ca07fc 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1186,7 +1186,7 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) switch (G.obedit->type){ case OB_ARMATURE: if(G.qual==LR_CTRLKEY){ - if (okee("Recalc bone roll angles")) { + if (okee("Recalculate bone roll angles")) { auto_align_armature(); allqueue(REDRAWVIEW3D, 0); } @@ -1194,15 +1194,15 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) break; case OB_MESH: if(G.qual==(LR_SHIFTKEY|LR_CTRLKEY)) { - if(okee("Recalc normals inside")) { - undo_push_mesh("Recalc normals inside"); + if(okee("Recalculate normals inside")) { + undo_push_mesh("Recalculate normals inside"); righthandfaces(2); allqueue(REDRAWVIEW3D, 0); } } else if(G.qual==LR_CTRLKEY){ - if(okee("Recalc normals outside")) { - undo_push_mesh("Recalc normals outside"); + if(okee("Recalculate normals outside")) { + undo_push_mesh("Recalculate normals outside"); righthandfaces(1); allqueue(REDRAWVIEW3D, 0); } diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index 9f615b8ec02..f3e662857c9 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -464,25 +464,25 @@ int save_image_filesel_str(char *str) { switch(G.scene->r.imtype) { case R_PNG: - strcpy(str, "SAVE PNG"); return 1; + strcpy(str, "Save PNG"); return 1; case R_BMP: - strcpy(str, "SAVE BMP"); return 1; + strcpy(str, "Save BMP"); return 1; case R_TARGA: - strcpy(str, "SAVE TARGA"); return 1; + strcpy(str, "Save Targa"); return 1; case R_RAWTGA: - strcpy(str, "SAVE RAW TARGA"); return 1; + strcpy(str, "Save Raw Targa"); return 1; case R_IRIS: - strcpy(str, "SAVE IRIS"); return 1; + strcpy(str, "Save IRIS"); return 1; case R_IRIZ: - strcpy(str, "SAVE IRIS"); return 1; + strcpy(str, "Save IRIS"); return 1; case R_HAMX: - strcpy(str, "SAVE HAMX"); return 1; + strcpy(str, "Save HAMX"); return 1; case R_FTYPE: - strcpy(str, "SAVE FTYPE"); return 1; + strcpy(str, "Save Ftype"); return 1; case R_JPEG90: - strcpy(str, "SAVE JPEG"); return 1; + strcpy(str, "Save JPEG"); return 1; default: - strcpy(str, "SAVE IMAGE"); return 0; + strcpy(str, "Save Image"); return 0; } } @@ -540,11 +540,11 @@ int blenderqread(unsigned short event, short val) areawinset(sa->win); } - activate_fileselect(FILE_BLENDER, "LOAD FILE", G.sce, BIF_read_file); + activate_fileselect(FILE_BLENDER, "Open File", G.sce, BIF_read_file); return 0; } else if(G.qual==LR_SHIFTKEY) { - activate_fileselect(FILE_LOADLIB, "LOAD LIBRARY", G.lib, 0); + activate_fileselect(FILE_LOADLIB, "Load Library", G.lib, 0); return 0; } break; @@ -552,7 +552,7 @@ int blenderqread(unsigned short event, short val) if(G.qual==0) { strcpy(dir, G.sce); untitled(dir); - activate_fileselect(FILE_BLENDER, "SAVE FILE", dir, BIF_write_file); + activate_fileselect(FILE_BLENDER, "Save File", dir, BIF_write_file); return 0; } else if(G.qual==LR_CTRLKEY) { @@ -581,7 +581,7 @@ int blenderqread(unsigned short event, short val) ob= OBACT; if(ob) strcpy(str, ob->id.name); - activate_fileselect(FILE_MAIN, "DATA SELECT", str, 0); + activate_fileselect(FILE_MAIN, "Data Select", str, 0); return 0; } else if(G.qual==0) { @@ -844,7 +844,7 @@ int blenderqread(unsigned short event, short val) if(G.qual==LR_CTRLKEY) { strcpy(dir, G.sce); if (untitled(dir)) { - activate_fileselect(FILE_BLENDER, "SAVE FILE", dir, BIF_write_file); + activate_fileselect(FILE_BLENDER, "Save File", dir, BIF_write_file); } else { BIF_write_file(dir); free_filesel_spec(dir); @@ -913,7 +913,7 @@ int blenderqread(unsigned short event, short val) case UKEY: if(textediting==0) { if(G.qual==LR_CTRLKEY) { - if(okee("SAVE USER DEFAULTS")) { + if(okee("Save user defaults")) { BIF_write_homefile(); } return 0; @@ -926,7 +926,7 @@ int blenderqread(unsigned short event, short val) if(G.qual==LR_CTRLKEY) { strcpy(dir, G.sce); if (untitled(dir)) { - activate_fileselect(FILE_BLENDER, "SAVE FILE", dir, BIF_write_file); + activate_fileselect(FILE_BLENDER, "Save File", dir, BIF_write_file); } else { BIF_write_file(dir); free_filesel_spec(dir); diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c index bd9cf884970..17e38b84fcd 100644 --- a/source/blender/src/vpaint.c +++ b/source/blender/src/vpaint.c @@ -231,7 +231,7 @@ void make_vertexcol() /* single ob */ */ if(G.obedit) { - error("Unable to perform function in EditMode"); + error("Unable to perform function in Edit Mode"); return; } @@ -795,7 +795,7 @@ void weight_paint(void) return; } if(me==0 || me->totface==0) return; - if(ob->lay & G.vd->lay); else error("Active object not in this layer!"); + if(ob->lay & G.vd->lay); else error("Active object is not in this layer"); persp(PERSP_VIEW); /* imat for normals */ @@ -951,7 +951,7 @@ void vertex_paint() ob= OBACT; me= get_mesh(ob); if(me==0 || me->totface==0) return; - if(ob->lay & G.vd->lay); else error("Active object not in this layer!"); + if(ob->lay & G.vd->lay); else error("Active object is not in this layer"); if(me->tface==NULL && me->mcol==NULL) make_vertexcol(); -- cgit v1.2.3