Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few...
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 26 Oct 2012 17:32:50 +0000 (17:32 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 26 Oct 2012 17:32:50 +0000 (17:32 +0000)
73 files changed:
release/scripts/modules/bl_i18n_utils/settings.py
release/scripts/modules/bl_i18n_utils/spell_check_utils.py
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/CMakeLists.txt
source/blender/bmesh/SConscript
source/blender/bmesh/intern/bmesh_operators.c
source/blender/bmesh/operators/bmo_extrude.c
source/blender/bmesh/operators/bmo_slide.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/mesh/editmesh_loopcut.c
source/blender/editors/mesh/editmesh_rip.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_group.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/SConscript
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screendump.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_buttons/buttons_ops.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_node/node_add.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sequencer/SConscript
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_text/SConscript
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesrna/intern/rna_gpencil.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sequencer_api.c
source/blender/python/intern/bpy_util.c

index bb1a4c521a83350b2c00c748ff82a9f9a9253c89..7de6ff80fe4d2ab47ec2e3f7e2854422fc54fe2b 100644 (file)
@@ -156,12 +156,14 @@ PYGETTEXT_KEYWORDS = (() +
           for it in ("IFACE_", "TIP_", "N_")) +
     tuple((r"{}\(\s*" + _ctxt_re + r"\s*,\s*" + _msg_re + r"\s*\)").format(it)
           for it in ("CTX_IFACE_", "CTX_TIP_", "CTX_N_")) + 
           for it in ("IFACE_", "TIP_", "N_")) +
     tuple((r"{}\(\s*" + _ctxt_re + r"\s*,\s*" + _msg_re + r"\s*\)").format(it)
           for it in ("CTX_IFACE_", "CTX_TIP_", "CTX_N_")) + 
-    tuple(("{}\\([^\"',]+,(?:[^\"',]+,)?\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
-          for it in ("BKE_report", "BKE_reportf", "BKE_reports_prepend", "BKE_reports_prependf"))
+    tuple(("{}\\((?:[^\"',]+,){{1,2}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
+          for it in ("BKE_report", "BKE_reportf", "BKE_reports_prepend", "BKE_reports_prependf")) +
+    tuple(("{}\\((?:[^\"',]+,){{3}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
+          for it in ("BMO_error_raise",))
 )
 
 ESCAPE_RE = (
 )
 
 ESCAPE_RE = (
-    ('((?<!\\\\)"|(?<!\\\\)\\\\(?!\\\\|"))', r"\\\1"),
+    (r'((?<!\\)"|(?<!\\)\\(?!\\|"))', r"\\\1"),
     ('\t', r"\\t"),
 )
 
     ('\t', r"\\t"),
 )
 
index d8cb77cd364f2709ae6a5f8abb46ff56319500c4..60a943d2bd448bc95d3a1419485f29605e2ad924 100644 (file)
@@ -91,6 +91,7 @@ dict_uimsgs = {
     "fullscreen",
     "gridline",
     "hemi",
     "fullscreen",
     "gridline",
     "hemi",
+    "inbetween",
     "inscatter", "inscattering",
     "libdata",
     "lightless",
     "inscatter", "inscattering",
     "libdata",
     "lightless",
@@ -147,6 +148,7 @@ dict_uimsgs = {
     "tilemode",
     "timestamp", "timestamps",
     "timestep", "timesteps",
     "tilemode",
     "timestamp", "timestamps",
     "timestep", "timesteps",
+    "todo",
     "un",
     "unbake",
     "uncomment",
     "un",
     "unbake",
     "uncomment",
@@ -235,6 +237,7 @@ dict_uimsgs = {
     "quat", "quats",
     "recalc", "recalcs",
     "refl",
     "quat", "quats",
     "recalc", "recalcs",
     "refl",
+    "sel",
     "spec",
     "struct", "structs",
     "tex",
     "spec",
     "struct", "structs",
     "tex",
index 45ac2dee454b8ea53fb79218554fafb140ff2961..2a9f3bd920cdc4b33d9b97df2cdbc73976933a70 100644 (file)
@@ -32,6 +32,8 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
@@ -848,7 +850,7 @@ static void surfaceGenerateGrid(struct DynamicPaintSurface *surface)
                grid->s_num = MEM_reallocN(grid->s_num, sizeof(int) * grid_cells);
 
                if (error || !grid->s_num) {
                grid->s_num = MEM_reallocN(grid->s_num, sizeof(int) * grid_cells);
 
                if (error || !grid->s_num) {
-                       setError(surface->canvas, "Not enough free memory.");
+                       setError(surface->canvas, N_("Not enough free memory"));
                        freeGrid(sData);
                }
        }
                        freeGrid(sData);
                }
        }
@@ -1235,7 +1237,7 @@ static void dynamicPaint_allocateSurfaceType(DynamicPaintSurface *surface)
                        break;
        }
 
                        break;
        }
 
-       if (sData->type_data == NULL) setError(surface->canvas, "Not enough free memory!");
+       if (sData->type_data == NULL) setError(surface->canvas, N_("Not enough free memory"));
 }
 
 static int surface_usesAdjDistance(DynamicPaintSurface *surface)
 }
 
 static int surface_usesAdjDistance(DynamicPaintSurface *surface)
@@ -1292,7 +1294,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, int for
        if (!ad->n_index || !ad->n_num || !ad->n_target || !temp_data) {
                dynamicPaint_freeAdjData(sData);
                if (temp_data) MEM_freeN(temp_data);
        if (!ad->n_index || !ad->n_num || !ad->n_target || !temp_data) {
                dynamicPaint_freeAdjData(sData);
                if (temp_data) MEM_freeN(temp_data);
-               setError(surface->canvas, "Not enough free memory.");
+               setError(surface->canvas, N_("Not enough free memory"));
                return;
        }
 
                return;
        }
 
@@ -2165,8 +2167,10 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
        int *final_index;
        int aa_samples;
 
        int *final_index;
        int aa_samples;
 
-       if (!dm) return setError(canvas, "Canvas mesh not updated.");
-       if (surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ) return setError(canvas, "Can't bake non-\"image sequence\" formats.");
+       if (!dm)
+               return setError(canvas, N_("Canvas mesh not updated"));
+       if (surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ)
+               return setError(canvas, N_("Cannot bake non-'image sequence' formats"));
 
        numOfFaces = dm->getNumTessFaces(dm);
        mface = dm->getTessFaceArray(dm);
 
        numOfFaces = dm->getNumTessFaces(dm);
        mface = dm->getTessFaceArray(dm);
@@ -2176,8 +2180,10 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
        tface = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, uvname);
 
        /* Check for validity   */
        tface = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, uvname);
 
        /* Check for validity   */
-       if (!tface) return setError(canvas, "No UV data on canvas.");
-       if (surface->image_resolution < 16 || surface->image_resolution > 8192) return setError(canvas, "Invalid resolution.");
+       if (!tface)
+               return setError(canvas, N_("No UV data on canvas"));
+       if (surface->image_resolution < 16 || surface->image_resolution > 8192)
+               return setError(canvas, N_("Invalid resolution"));
 
        w = h = surface->image_resolution;
 
 
        w = h = surface->image_resolution;
 
@@ -2189,7 +2195,8 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
        /* Init data struct */
        if (surface->data) dynamicPaint_freeSurfaceData(surface);
        sData = surface->data = MEM_callocN(sizeof(PaintSurfaceData), "PaintSurfaceData");
        /* Init data struct */
        if (surface->data) dynamicPaint_freeSurfaceData(surface);
        sData = surface->data = MEM_callocN(sizeof(PaintSurfaceData), "PaintSurfaceData");
-       if (!surface->data) return setError(canvas, "Not enough free memory.");
+       if (!surface->data)
+               return setError(canvas, N_("Not enough free memory"));
 
        aa_samples = (surface->flags & MOD_DPAINT_ANTIALIAS) ? 5 : 1;
        tempPoints = (struct PaintUVPoint *) MEM_callocN(w * h * sizeof(struct PaintUVPoint), "Temp PaintUVPoint");
 
        aa_samples = (surface->flags & MOD_DPAINT_ANTIALIAS) ? 5 : 1;
        tempPoints = (struct PaintUVPoint *) MEM_callocN(w * h * sizeof(struct PaintUVPoint), "Temp PaintUVPoint");
@@ -2547,7 +2554,8 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
                        }
                }
        }
                        }
                }
        }
-       if (error == 1) setError(canvas, "Not enough free memory.");
+       if (error == 1)
+               setError(canvas, N_("Not enough free memory"));
 
        if (faceBB) MEM_freeN(faceBB);
        if (tempPoints) MEM_freeN(tempPoints);
 
        if (faceBB) MEM_freeN(faceBB);
        if (tempPoints) MEM_freeN(tempPoints);
@@ -2598,7 +2606,10 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam
        int format = (surface->image_fileformat & MOD_DPAINT_IMGFORMAT_OPENEXR) ? R_IMF_IMTYPE_OPENEXR : R_IMF_IMTYPE_PNG;
        char output_file[FILE_MAX];
 
        int format = (surface->image_fileformat & MOD_DPAINT_IMGFORMAT_OPENEXR) ? R_IMF_IMTYPE_OPENEXR : R_IMF_IMTYPE_PNG;
        char output_file[FILE_MAX];
 
-       if (!sData->type_data) { setError(surface->canvas, "Image save failed: Invalid surface."); return; }
+       if (!sData->type_data) {
+               setError(surface->canvas, N_("Image save failed: invalid surface"));
+               return;
+       }
        /* if selected format is openexr, but current build doesnt support one */
        #ifndef WITH_OPENEXR
        if (format == R_IMF_IMTYPE_OPENEXR) format = R_IMF_IMTYPE_PNG;
        /* if selected format is openexr, but current build doesnt support one */
        #ifndef WITH_OPENEXR
        if (format == R_IMF_IMTYPE_OPENEXR) format = R_IMF_IMTYPE_PNG;
@@ -2612,7 +2623,10 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam
 
        /* Init image buffer    */
        ibuf = IMB_allocImBuf(surface->image_resolution, surface->image_resolution, 32, IB_rectfloat);
 
        /* Init image buffer    */
        ibuf = IMB_allocImBuf(surface->image_resolution, surface->image_resolution, 32, IB_rectfloat);
-       if (ibuf == NULL) { setError(surface->canvas, "Image save failed: Not enough free memory."); return; }
+       if (ibuf == NULL) {
+               setError(surface->canvas, N_("Image save failed: not enough free memory"));
+               return;
+       }
 
        #pragma omp parallel for schedule(static)
        for (index = 0; index < sData->total_points; index++) {
 
        #pragma omp parallel for schedule(static)
        for (index = 0; index < sData->total_points; index++) {
@@ -4649,7 +4663,7 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, Scene *sc
                        if (bData->realCoord) MEM_freeN(bData->realCoord);
                        if (canvas_verts) MEM_freeN(canvas_verts);
 
                        if (bData->realCoord) MEM_freeN(bData->realCoord);
                        if (canvas_verts) MEM_freeN(canvas_verts);
 
-                       return setError(surface->canvas, "Not enough free memory.");
+                       return setError(surface->canvas, N_("Not enough free memory"));
                }
 
                new_bdata = 1;
                }
 
                new_bdata = 1;
@@ -4934,7 +4948,7 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su
                        /* Allocate memory for surface previous points to read unchanged values from    */
                        prevPoint = MEM_mallocN(sData->total_points * sizeof(struct PaintPoint), "PaintSurfaceDataCopy");
                        if (!prevPoint)
                        /* Allocate memory for surface previous points to read unchanged values from    */
                        prevPoint = MEM_mallocN(sData->total_points * sizeof(struct PaintPoint), "PaintSurfaceDataCopy");
                        if (!prevPoint)
-                               return setError(canvas, "Not enough free memory.");
+                               return setError(canvas, N_("Not enough free memory"));
 
                        /* Prepare effects and get number of required steps */
                        steps = dynamicPaint_prepareEffectStep(surface, scene, ob, &force, timescale);
 
                        /* Prepare effects and get number of required steps */
                        steps = dynamicPaint_prepareEffectStep(surface, scene, ob, &force, timescale);
index 9635e596c183200f4814f0de55a359f51a8c4ced..b6ebc42fcf6b602e97315da1e207980599eb089f 100644 (file)
@@ -53,6 +53,8 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "BKE_animsys.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_animsys.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -3676,26 +3678,26 @@ int BKE_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
        char name[sizeof(seq_a->name)];
 
        if (seq_a->len != seq_b->len) {
        char name[sizeof(seq_a->name)];
 
        if (seq_a->len != seq_b->len) {
-               *error_str = "Strips must be the same length";
+               *error_str = N_("Strips must be the same length");
                return 0;
        }
 
                return 0;
        }
 
-       /* type checking, could be more advanced but disalow sound vs non-sound copy */
+       /* type checking, could be more advanced but disallow sound vs non-sound copy */
        if (seq_a->type != seq_b->type) {
                if (seq_a->type == SEQ_TYPE_SOUND_RAM || seq_b->type == SEQ_TYPE_SOUND_RAM) {
        if (seq_a->type != seq_b->type) {
                if (seq_a->type == SEQ_TYPE_SOUND_RAM || seq_b->type == SEQ_TYPE_SOUND_RAM) {
-                       *error_str = "Strips were not compatible";
+                       *error_str = N_("Strips were not compatible");
                        return 0;
                }
 
                /* disallow effects to swap with non-effects strips */
                if ((seq_a->type & SEQ_TYPE_EFFECT) != (seq_b->type & SEQ_TYPE_EFFECT)) {
                        return 0;
                }
 
                /* disallow effects to swap with non-effects strips */
                if ((seq_a->type & SEQ_TYPE_EFFECT) != (seq_b->type & SEQ_TYPE_EFFECT)) {
-                       *error_str = "Strips were not compatible";
+                       *error_str = N_("Strips were not compatible");
                        return 0;
                }
 
                if ((seq_a->type & SEQ_TYPE_EFFECT) && (seq_b->type & SEQ_TYPE_EFFECT)) {
                        if (BKE_sequence_effect_get_num_inputs(seq_a->type) != BKE_sequence_effect_get_num_inputs(seq_b->type)) {
                        return 0;
                }
 
                if ((seq_a->type & SEQ_TYPE_EFFECT) && (seq_b->type & SEQ_TYPE_EFFECT)) {
                        if (BKE_sequence_effect_get_num_inputs(seq_a->type) != BKE_sequence_effect_get_num_inputs(seq_b->type)) {
-                               *error_str = "Strips must have the same number of inputs";
+                               *error_str = N_("Strips must have the same number of inputs");
                                return 0;
                        }
                }
                                return 0;
                        }
                }
index 9d422b0d28d0ce611676fbc1ccfc6fd482db1a3b..e39ad4a08c03fb9be1a2468ffa29ac54267e7971 100644 (file)
@@ -51,6 +51,8 @@
 #include "BLI_string.h"
 #include "BLI_threads.h"
 
 #include "BLI_string.h"
 #include "BLI_threads.h"
 
+#include "BLF_translation.h"
+
 #include "BKE_global.h"
 #include "BKE_tracking.h"
 #include "BKE_movieclip.h"
 #include "BKE_global.h"
 #include "BKE_tracking.h"
 #include "BKE_movieclip.h"
@@ -2787,7 +2789,7 @@ int BKE_tracking_reconstruction_check(MovieTracking *tracking, MovieTrackingObje
                return TRUE;
        }
        else if (reconstruct_count_tracks_on_both_keyframes(tracking, object) < 8) {
                return TRUE;
        }
        else if (reconstruct_count_tracks_on_both_keyframes(tracking, object) < 8) {
-               BLI_strncpy(error_msg, "At least 8 common tracks on both of keyframes are needed for reconstruction",
+               BLI_strncpy(error_msg, N_("At least 8 common tracks on both of keyframes are needed for reconstruction"),
                            error_size);
 
                return FALSE;
                            error_size);
 
                return FALSE;
@@ -2795,7 +2797,7 @@ int BKE_tracking_reconstruction_check(MovieTracking *tracking, MovieTrackingObje
 
        return TRUE;
 #else
 
        return TRUE;
 #else
-       BLI_strncpy(error_msg, "Blender is compiled without motion tracking library", error_size);
+       BLI_strncpy(error_msg, N_("Blender is compiled without motion tracking library"), error_size);
 
        (void) tracking;
        (void) object;
 
        (void) tracking;
        (void) object;
index 464ffc0f2f3065edf1ccdfe3b34c61223f4225c5..72f74fb26ad7c1eaf454e974aa98c9a8a2e19e3c 100644 (file)
@@ -1002,7 +1002,7 @@ FileData *blo_openblenderfile(const char *filepath, ReportList *reports)
        
        if (gzfile == (gzFile)Z_NULL) {
                BKE_reportf(reports, RPT_WARNING, "Unable to open '%s': %s",
        
        if (gzfile == (gzFile)Z_NULL) {
                BKE_reportf(reports, RPT_WARNING, "Unable to open '%s': %s",
-                           filepath, errno ? strerror(errno) : TIP_("Unknown error reading file"));
+                           filepath, errno ? strerror(errno) : TIP_("unknown error reading file"));
                return NULL;
        }
        else {
                return NULL;
        }
        else {
@@ -4797,7 +4797,7 @@ static void lib_link_scene(FileData *fd, Main *main)
                                base->object = newlibadr_us(fd, sce->id.lib, base->object);
                                
                                if (base->object == NULL) {
                                base->object = newlibadr_us(fd, sce->id.lib, base->object);
                                
                                if (base->object == NULL) {
-                                       BKE_reportf_wrap(fd->reports, RPT_WARNING, "LIB ERROR: object lost from scene: '%s'",
+                                       BKE_reportf_wrap(fd->reports, RPT_WARNING, TIP_("LIB ERROR: object lost from scene: '%s'"),
                                                         sce->id.name + 2);
                                        BLI_remlink(&sce->base, base);
                                        if (base == sce->basact) sce->basact = NULL;
                                                         sce->id.name + 2);
                                        BLI_remlink(&sce->base, base);
                                        if (base == sce->basact) sce->basact = NULL;
@@ -6025,11 +6025,11 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main)
                if (newmain->curlib) {
                        if (BLI_path_cmp(newmain->curlib->filepath, lib->filepath) == 0) {
                                BKE_reportf_wrap(fd->reports, RPT_WARNING,
                if (newmain->curlib) {
                        if (BLI_path_cmp(newmain->curlib->filepath, lib->filepath) == 0) {
                                BKE_reportf_wrap(fd->reports, RPT_WARNING,
-                                                "Library '%s', '%s' had multiple instances, save and reload!",
+                                                TIP_("Library '%s', '%s' had multiple instances, save and reload!"),
                                                 lib->name, lib->filepath);
                                
                                change_idid_adr(fd->mainlist, fd, lib, newmain->curlib);
                                                 lib->name, lib->filepath);
                                
                                change_idid_adr(fd->mainlist, fd, lib, newmain->curlib);
-//                             change_idid_adr_fd(fd, lib, newmain->curlib);
+/*                             change_idid_adr_fd(fd, lib, newmain->curlib); */
                                
                                BLI_remlink(&main->library, lib);
                                MEM_freeN(lib);
                                
                                BLI_remlink(&main->library, lib);
                                MEM_freeN(lib);
@@ -6043,8 +6043,10 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main)
        BLI_strncpy(lib->filepath, lib->name, sizeof(lib->name));
        cleanup_path(fd->relabase, lib->filepath);
        
        BLI_strncpy(lib->filepath, lib->name, sizeof(lib->name));
        cleanup_path(fd->relabase, lib->filepath);
        
-//     printf("direct_link_library: name %s\n", lib->name);
-//     printf("direct_link_library: filename %s\n", lib->filename);
+#if 0
+       printf("direct_link_library: name %s\n", lib->name);
+       printf("direct_link_library: filename %s\n", lib->filename);
+#endif
        
        /* new main */
        newmain= MEM_callocN(sizeof(Main), "directlink");
        
        /* new main */
        newmain= MEM_callocN(sizeof(Main), "directlink");
@@ -7438,8 +7440,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                        prop = BKE_bproperty_object_get(ob, "Text");
                                        if (prop) {
                                                BKE_reportf_wrap(fd->reports, RPT_WARNING,
                                        prop = BKE_bproperty_object_get(ob, "Text");
                                        if (prop) {
                                                BKE_reportf_wrap(fd->reports, RPT_WARNING,
-                                                                "Game property name conflict in object '%s':\ntext objects reserve the "
-                                                                "['Text'] game property to change their content through logic bricks",
+                                                                TIP_("Game property name conflict in object '%s':\ntext objects reserve the "
+                                                                     "['Text'] game property to change their content through logic bricks"),
                                                                 ob->id.name + 2);
                                        }
                                }
                                                                 ob->id.name + 2);
                                        }
                                }
@@ -9735,8 +9737,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
                                
                                if (fd == NULL) {
                                        /* printf and reports for now... its important users know this */
                                
                                if (fd == NULL) {
                                        /* printf and reports for now... its important users know this */
-                                       BKE_reportf_wrap(basefd->reports, RPT_INFO,
-                                                        "Read library:  '%s', '%s'",
+                                       BKE_reportf_wrap(basefd->reports, RPT_INFO, TIP_("Read library:  '%s', '%s'"),
                                                         mainptr->curlib->filepath, mainptr->curlib->name);
                                        
                                        fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
                                                         mainptr->curlib->filepath, mainptr->curlib->name);
                                        
                                        fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
@@ -9789,8 +9790,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
                                        else mainptr->curlib->filedata = NULL;
                                        
                                        if (fd == NULL) {
                                        else mainptr->curlib->filedata = NULL;
                                        
                                        if (fd == NULL) {
-                                               BKE_reportf_wrap(basefd->reports, RPT_WARNING,
-                                                                "Cannot find lib '%s'",
+                                               BKE_reportf_wrap(basefd->reports, RPT_WARNING, TIP_("Cannot find lib '%s'"),
                                                                 mainptr->curlib->filepath);
                                        }
                                }
                                                                 mainptr->curlib->filepath);
                                        }
                                }
@@ -9809,7 +9809,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
                                                                append_id_part(fd, mainptr, id, &realid);
                                                                if (!realid) {
                                                                        BKE_reportf_wrap(fd->reports, RPT_WARNING,
                                                                append_id_part(fd, mainptr, id, &realid);
                                                                if (!realid) {
                                                                        BKE_reportf_wrap(fd->reports, RPT_WARNING,
-                                                                                        "LIB ERROR: %s: '%s' missing from '%s'",
+                                                                                        TIP_("LIB ERROR: %s: '%s' missing from '%s'"),
                                                                                         BKE_idcode_to_name(GS(id->name)),
                                                                                         id->name+2, mainptr->curlib->filepath);
                                                                }
                                                                                         BKE_idcode_to_name(GS(id->name)),
                                                                                         id->name+2, mainptr->curlib->filepath);
                                                                }
@@ -9841,7 +9841,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
                                if (id->flag & LIB_READ) {
                                        BLI_remlink(lbarray[a], id);
                                        BKE_reportf_wrap(basefd->reports, RPT_WARNING,
                                if (id->flag & LIB_READ) {
                                        BLI_remlink(lbarray[a], id);
                                        BKE_reportf_wrap(basefd->reports, RPT_WARNING,
-                                                        "LIB ERROR: %s: '%s' unread libblock missing from '%s'",
+                                                        TIP_("LIB ERROR: %s: '%s' unread lib block missing from '%s'"),
                                                         BKE_idcode_to_name(GS(id->name)), id->name + 2, mainptr->curlib->filepath);
                                        change_idid_adr(mainlist, basefd, id, NULL);
                                        
                                                         BKE_idcode_to_name(GS(id->name)), id->name + 2, mainptr->curlib->filepath);
                                        change_idid_adr(mainlist, basefd, id, NULL);
                                        
index 1753fd3650f5b86081478ca13d383d9c9358fa28..f811dcf956e563d4d944c2389355d46ed4764ece 100644 (file)
@@ -25,6 +25,7 @@
 
 set(INC 
        .
 
 set(INC 
        .
+       ../blenfont
        ../blenkernel
        ../blenlib
        ../makesdna
        ../blenkernel
        ../blenlib
        ../makesdna
@@ -115,7 +116,11 @@ if(MSVC)
 endif()
 
 if(WITH_BULLET)
 endif()
 
 if(WITH_BULLET)
-  add_definitions(-DWITH_BULLET)
+       add_definitions(-DWITH_BULLET)
+endif()
+
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}")
 endif()
 
 blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}")
index 382c206c50f05e890040f09848672ca6336b8314..6765d57cb3e4dfa0585a4c7fc16617e98fdb6599 100644 (file)
@@ -9,6 +9,7 @@ sources += env.Glob('tools/*.c')
 
 incs = [
        './',
 
 incs = [
        './',
+       '../blenfont',
        '../blenlib',
        '../makesdna',
        '../blenkernel',
        '../blenlib',
        '../makesdna',
        '../blenkernel',
@@ -21,4 +22,7 @@ defs = []
 if env['WITH_BF_BULLET']:
     defs.append('WITH_BULLET')
 
 if env['WITH_BF_BULLET']:
     defs.append('WITH_BULLET')
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
 env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = ['core','player'], defines=defs, priority=[100, 100], compileflags=cflags )
 env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = ['core','player'], defines=defs, priority=[100, 100], compileflags=cflags )
index 2100cd2bd0bc82af64b7d4870e31e09badd992f5..015052e685df1d7ae17afd16523043d5733a3c76 100644 (file)
@@ -36,6 +36,8 @@
 #include "BLI_listbase.h"
 #include "BLI_array.h"
 
 #include "BLI_listbase.h"
 #include "BLI_array.h"
 
+#include "BLF_translation.h"
+
 #include "bmesh.h"
 #include "intern/bmesh_private.h"
 
 #include "bmesh.h"
 #include "intern/bmesh_private.h"
 
@@ -49,16 +51,16 @@ static int bmo_opname_to_opcode(const char *opname);
 
 static const char *bmo_error_messages[] = {
        NULL,
 
 static const char *bmo_error_messages[] = {
        NULL,
-       "Self intersection error",
-       "Could not dissolve vert",
-       "Could not connect vertices",
-       "Could not traverse mesh",
-       "Could not dissolve faces",
-       "Could not dissolve vertices",
-       "Tessellation error",
-       "Can not deal with non-manifold geometry",
-       "Invalid selection",
-       "Internal mesh error",
+       N_("Self intersection error"),
+       N_("Could not dissolve vert"),
+       N_("Could not connect vertices"),
+       N_("Could not traverse mesh"),
+       N_("Could not dissolve faces"),
+       N_("Could not dissolve vertices"),
+       N_("Tessellation error"),
+       N_("Cannot deal with non-manifold geometry"),
+       N_("Invalid selection"),
+       N_("Internal mesh error"),
 };
 
 
 };
 
 
@@ -1241,7 +1243,9 @@ void BMO_error_raise(BMesh *bm, BMOperator *owner, int errcode, const char *msg)
        BMOpError *err = MEM_callocN(sizeof(BMOpError), "bmop_error");
        
        err->errorcode = errcode;
        BMOpError *err = MEM_callocN(sizeof(BMOpError), "bmop_error");
        
        err->errorcode = errcode;
-       if (!msg) msg = bmo_error_messages[errcode];
+       if (!msg) {
+               msg = bmo_error_messages[errcode];
+       }
        err->msg = msg;
        err->op = owner;
        
        err->msg = msg;
        err->op = owner;
        
index 81cad277beea705d124cc11899af118a59ffce6a..e55108059f584c5f9cd4770f914ced6cd7b2fb68 100644 (file)
@@ -88,7 +88,7 @@ void bmo_extrude_discrete_faces_exec(BMesh *bm, BMOperator *op)
 
                f2 = BM_face_create_ngon(bm, firstv, BM_edge_other_vert(edges[0], firstv), edges, f->len, FALSE);
                if (UNLIKELY(f2 == NULL)) {
 
                f2 = BM_face_create_ngon(bm, firstv, BM_edge_other_vert(edges[0], firstv), edges, f->len, FALSE);
                if (UNLIKELY(f2 == NULL)) {
-                       BMO_error_raise(bm, op, BMERR_MESH_ERROR, "Extrude failed; could not create face");
+                       BMO_error_raise(bm, op, BMERR_MESH_ERROR, "Extrude failed: could not create face");
                        BLI_array_free(edges);
                        return;
                }
                        BLI_array_free(edges);
                        return;
                }
index 0036f095d0070b722c76c4d103b5bf2646df59f9..6db76119205636b0f152702db62409f57ac95bc4 100644 (file)
@@ -63,7 +63,7 @@ void bmo_slide_vert_exec(BMesh *bm, BMOperator *op)
                if (G.debug & G_DEBUG) {
                        fprintf(stderr, "slide_vert: No vertex selected...");
                }
                if (G.debug & G_DEBUG) {
                        fprintf(stderr, "slide_vert: No vertex selected...");
                }
-               BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, "Vertex Slide Error: Invalid selection.");
+               BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, "Vertex Slide error: invalid selection");
                return;
        }
 
                return;
        }
 
@@ -83,7 +83,7 @@ void bmo_slide_vert_exec(BMesh *bm, BMOperator *op)
                if (G.debug & G_DEBUG) {
                        fprintf(stderr, "slide_vert: select a single edge\n");
                }
                if (G.debug & G_DEBUG) {
                        fprintf(stderr, "slide_vert: select a single edge\n");
                }
-               BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, "Vertex Slide Error: Invalid selection.");
+               BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, "Vertex Slide error: invalid selection");
                return;
        }
 
                return;
        }
 
index 0ae06e71b66885c5d2f3653a9aeab9312143851a..852f3fa5469d359b561245d90c5914dca12ce7bb 100644 (file)
@@ -522,7 +522,7 @@ static int ed_markers_opwrap_invoke_custom(bContext *C, wmOperator *op, wmEvent
        else if (op->type->exec)
                retval = op->type->exec(C, op);
        else
        else if (op->type->exec)
                retval = op->type->exec(C, op);
        else
-               BKE_report(op->reports, RPT_ERROR, "Programming error: operator doesn't actually have code to do anything!");
+               BKE_report(op->reports, RPT_ERROR, "Programming error: operator does not actually have code to do anything!");
                
        /* return status modifications - for now, make this spacetype dependent as above */
        if (sa->spacetype != SPACE_TIME) {
                
        /* return status modifications - for now, make this spacetype dependent as above */
        if (sa->spacetype != SPACE_TIME) {
@@ -1377,7 +1377,7 @@ static int ed_marker_make_links_scene_exec(bContext *C, wmOperator *op)
        }
 
        if (scene_to == CTX_data_scene(C)) {
        }
 
        if (scene_to == CTX_data_scene(C)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't re-link markers into the same scene");
+               BKE_report(op->reports, RPT_ERROR, "Cannot re-link markers into the same scene");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 238dd9c68e4374a457b6f6bce09e8d680217b358..4f16c1a66223bf96c217faf860463cde7fd7241d 100644 (file)
@@ -789,7 +789,7 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
        /* F-Curve not editable? */
        if (fcurve_is_keyframable(fcu) == 0) {
                BKE_reportf(reports, RPT_ERROR, 
        /* F-Curve not editable? */
        if (fcurve_is_keyframable(fcu) == 0) {
                BKE_reportf(reports, RPT_ERROR, 
-                           "F-Curve with path = '%s' [%d] cannot be keyframed, ensure that it is not locked or sampled, "
+                           "F-Curve with path '%s[%d]' cannot be keyframed, ensure that it is not locked or sampled, "
                            "and try removing F-Modifiers",
                            fcu->rna_path, fcu->array_index);
                return 0;
                            "and try removing F-Modifiers",
                            fcu->rna_path, fcu->array_index);
                return 0;
@@ -1028,7 +1028,7 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
                        cfra = BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
                }
                else {
                        cfra = BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
                }
                else {
-                       BKE_reportf(reports, RPT_ERROR, "No action to delete keyframes from for ID = %s\n", id->name);
+                       BKE_reportf(reports, RPT_ERROR, "No action to delete keyframes from for ID = %s", id->name);
                        return 0;
                }
        }
                        return 0;
                }
        }
@@ -1126,7 +1126,7 @@ static short clear_keyframe(ReportList *reports, ID *id, bAction *act, const cha
                        act = adt->action;
                }
                else {
                        act = adt->action;
                }
                else {
-                       BKE_reportf(reports, RPT_ERROR, "No action to delete keyframes from for ID = %s\n", id->name);
+                       BKE_reportf(reports, RPT_ERROR, "No action to delete keyframes from for ID = %s", id->name);
                        return 0;
                }
        }
                        return 0;
                }
        }
@@ -1236,7 +1236,7 @@ static int insert_key_exec(bContext *C, wmOperator *op)
        /* try to insert keyframes for the channels specified by KeyingSet */
        success = ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
        if (G.debug & G_DEBUG)
        /* try to insert keyframes for the channels specified by KeyingSet */
        success = ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
        if (G.debug & G_DEBUG)
-               BKE_reportf(op->reports, RPT_INFO, "Keying set '%s' - successfully added %d keyframes\n", ks->name, success);
+               BKE_reportf(op->reports, RPT_INFO, "Keying set '%s' - successfully added %d keyframes", ks->name, success);
        
        /* report failure or do updates? */
        if (success == MODIFYKEY_INVALID_CONTEXT) {
        
        /* report failure or do updates? */
        if (success == MODIFYKEY_INVALID_CONTEXT) {
index 5844bd6708f54859774d3c5cbde0653bc85bd1dc..9c3c8de3ed66cc9eab8a7cb9f4aaaf4992faa1b8 100644 (file)
@@ -947,7 +947,7 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
                /* skip path if no ID pointer is specified */
                if (ksp->id == NULL) {
                        BKE_reportf(reports, RPT_WARNING,
                /* skip path if no ID pointer is specified */
                if (ksp->id == NULL) {
                        BKE_reportf(reports, RPT_WARNING,
-                                   "Skipping path in keying set, as it has no ID (KS = '%s', path = '%s'[%d])",
+                                   "Skipping path in keying set, as it has no ID (KS = '%s', path = '%s[%d]')",
                                    ks->name, ksp->rna_path, ksp->array_index);
                        continue;
                }
                                    ks->name, ksp->rna_path, ksp->array_index);
                        continue;
                }
index 15efe71397f84cad84b2543319887c243e7ae8c1..48da23d5e8d83b35a8e2ef23381e10990615f38f 100644 (file)
@@ -2970,7 +2970,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
        }
        else {
                /* FIXME.. figure out a method for multiple bones */
        }
        else {
                /* FIXME.. figure out a method for multiple bones */
-               BKE_reportf(op->reports, RPT_ERROR, "Too many points selected: %d\n", count);
+               BKE_reportf(op->reports, RPT_ERROR, "Too many points selected: %d", count);
                BLI_freelistN(&points);
                return OPERATOR_CANCELLED;
        }
                BLI_freelistN(&points);
                return OPERATOR_CANCELLED;
        }
index 51b7a3aa9849a08f0f2f4abc349255e4aee5ca6d..3963f9fed2d251d81d4bed8912223e9bdd8bb6dc 100644 (file)
@@ -53,7 +53,6 @@
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 
-
 #ifdef RIGID_DEFORM
 #include "BLI_polardecomp.h"
 #endif
 #ifdef RIGID_DEFORM
 #include "BLI_polardecomp.h"
 #endif
@@ -794,7 +793,7 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource,
                        }
                }
                else if (*err_str == NULL) {
                        }
                }
                else if (*err_str == NULL) {
-                       *err_str = "Bone Heat Weighting: failed to find solution for one or more bones";
+                       *err_str = N_("Bone Heat Weighting: failed to find solution for one or more bones");
                        break;
                }
 
                        break;
                }
 
index 336ff5e1023f6b458a7721fc7296ae450d53463a..685ae343b84d64e200406384f3f20f126f4486d0 100644 (file)
@@ -1361,7 +1361,7 @@ static int separate_exec(bContext *C, wmOperator *op)
        oldedit = oldcu->editnurb;
 
        if (oldcu->key) {
        oldedit = oldcu->editnurb;
 
        if (oldcu->key) {
-               BKE_report(op->reports, RPT_ERROR, "Can't separate a curve with vertex keys");
+               BKE_report(op->reports, RPT_ERROR, "Cannot separate a curve with vertex keys");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -3501,7 +3501,7 @@ static int set_spline_type_exec(bContext *C, wmOperator *op)
        int changed = 0, type = RNA_enum_get(op->ptr, "type");
 
        if (type == CU_CARDINAL || type == CU_BSPLINE) {
        int changed = 0, type = RNA_enum_get(op->ptr, "type");
 
        if (type == CU_CARDINAL || type == CU_BSPLINE) {
-               BKE_report(op->reports, RPT_ERROR, "Not implemented yet");
+               BKE_report(op->reports, RPT_ERROR, "Not yet implemented");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -3833,7 +3833,7 @@ static void merge_2_nurb(wmOperator *op, ListBase *editnurb, Nurb *nu1, Nurb *nu
        }
        
        if (nu1->pntsv != nu2->pntsv) {
        }
        
        if (nu1->pntsv != nu2->pntsv) {
-               BKE_report(op->reports, RPT_ERROR, "Resolution doesn't match");
+               BKE_report(op->reports, RPT_ERROR, "Resolution does not match");
                return;
        }
        
                return;
        }
        
@@ -3943,7 +3943,7 @@ static int merge_nurb(bContext *C, wmOperator *op)
        }
        
        if (ok == 0) {
        }
        
        if (ok == 0) {
-               BKE_report(op->reports, RPT_ERROR, "Resolution doesn't match");
+               BKE_report(op->reports, RPT_ERROR, "Resolution does not match");
                BLI_freelistN(&nsortbase);
                return OPERATOR_CANCELLED;
        }
                BLI_freelistN(&nsortbase);
                return OPERATOR_CANCELLED;
        }
@@ -4123,7 +4123,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
        }
 
        if (!ok) {
        }
 
        if (!ok) {
-               BKE_report(op->reports, RPT_ERROR, "Can't make segment");
+               BKE_report(op->reports, RPT_ERROR, "Cannot make segment");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -4376,7 +4376,7 @@ static int spin_exec(bContext *C, wmOperator *op)
                unit_m4(viewmat);
        
        if (!spin_nurb(viewmat, obedit, axis, cent)) {
                unit_m4(viewmat);
        
        if (!spin_nurb(viewmat, obedit, axis, cent)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't spin");
+               BKE_report(op->reports, RPT_ERROR, "Cannot spin");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -5624,10 +5624,10 @@ static int select_nth_exec(bContext *C, wmOperator *op)
 
        if (!CU_select_nth(obedit, nth)) {
                if (obedit->type == OB_SURF) {
 
        if (!CU_select_nth(obedit, nth)) {
                if (obedit->type == OB_SURF) {
-                       BKE_report(op->reports, RPT_ERROR, "Surface hasn't got active point");
+                       BKE_report(op->reports, RPT_ERROR, "Surface has not got active point");
                }
                else {
                }
                else {
-                       BKE_report(op->reports, RPT_ERROR, "Curve hasn't got active point");
+                       BKE_report(op->reports, RPT_ERROR, "Curve has not got active point");
                }
 
                return OPERATOR_CANCELLED;
                }
 
                return OPERATOR_CANCELLED;
index 46df8ba5fac80ad03eb407bf0422ca25bbf8ff1c..ed8a1ea8280bd14420735b91743e24efa1e9b0fc 100644 (file)
@@ -212,7 +212,7 @@ static int gp_data_add_exec(bContext *C, wmOperator *op)
        bGPdata **gpd_ptr = gpencil_data_get_pointers(C, NULL);
        
        if (gpd_ptr == NULL) {
        bGPdata **gpd_ptr = gpencil_data_get_pointers(C, NULL);
        
        if (gpd_ptr == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "Nowhere for Grease Pencil data to go");
+               BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
                return OPERATOR_CANCELLED;
        }
        else {
                return OPERATOR_CANCELLED;
        }
        else {
@@ -260,7 +260,7 @@ static int gp_data_unlink_exec(bContext *C, wmOperator *op)
        bGPdata **gpd_ptr = gpencil_data_get_pointers(C, NULL);
        
        if (gpd_ptr == NULL) {
        bGPdata **gpd_ptr = gpencil_data_get_pointers(C, NULL);
        
        if (gpd_ptr == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "Nowhere for Grease Pencil data to go");
+               BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
                return OPERATOR_CANCELLED;
        }
        else {
                return OPERATOR_CANCELLED;
        }
        else {
@@ -299,7 +299,7 @@ static int gp_layer_add_exec(bContext *C, wmOperator *op)
        
        /* if there's no existing Grease-Pencil data there, add some */
        if (gpd_ptr == NULL) {
        
        /* if there's no existing Grease-Pencil data there, add some */
        if (gpd_ptr == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "Nowhere for Grease Pencil data to go");
+               BKE_report(op->reports, RPT_ERROR, "Nowhere for grease pencil data to go");
                return OPERATOR_CANCELLED;
        }
        if (*gpd_ptr == NULL)
                return OPERATOR_CANCELLED;
        }
        if (*gpd_ptr == NULL)
@@ -348,7 +348,7 @@ static int gp_actframe_delete_exec(bContext *C, wmOperator *op)
        
        /* if there's no existing Grease-Pencil data there, add some */
        if (gpd == NULL) {
        
        /* if there's no existing Grease-Pencil data there, add some */
        if (gpd == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No Grease Pencil data");
+               BKE_report(op->reports, RPT_ERROR, "No grease pencil data");
                return OPERATOR_CANCELLED;
        }
        if (ELEM(NULL, gpl, gpf)) {
                return OPERATOR_CANCELLED;
        }
        if (ELEM(NULL, gpl, gpf)) {
@@ -634,7 +634,7 @@ static int gp_convert_layer_exec(bContext *C, wmOperator *op)
 
        /* check if there's data to work with */
        if (gpd == NULL) {
 
        /* check if there's data to work with */
        if (gpd == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No Grease Pencil data to work on");
+               BKE_report(op->reports, RPT_ERROR, "No grease pencil data to work on");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 017ffdcfb14c57eba602648ff564861597de1e77..e7a5f993d3243219103eb90cd183af4032c22045 100644 (file)
@@ -807,7 +807,7 @@ static int editsource_text_edit(bContext *C, wmOperator *op,
        }
 
        if (text == NULL) {
        }
 
        if (text == NULL) {
-               BKE_reportf(op->reports, RPT_WARNING, "File: '%s' can't be opened", filepath);
+               BKE_reportf(op->reports, RPT_WARNING, "File '%s' cannot be opened", filepath);
                return OPERATOR_CANCELLED;
        }
        else {
                return OPERATOR_CANCELLED;
        }
        else {
@@ -870,12 +870,12 @@ static int editsource_exec(bContext *C, wmOperator *op)
                                                           but_store->py_dbg_ln);
                        }
                        else {
                                                           but_store->py_dbg_ln);
                        }
                        else {
-                               BKE_report(op->reports, RPT_ERROR, "Active button isn't from a script, cant edit source");
+                               BKE_report(op->reports, RPT_ERROR, "Active button is not from a script, cannot edit source");
                                ret = OPERATOR_CANCELLED;
                        }
                }
                else {
                                ret = OPERATOR_CANCELLED;
                        }
                }
                else {
-                       BKE_report(op->reports, RPT_ERROR, "Active button match can't be found");
+                       BKE_report(op->reports, RPT_ERROR, "Active button match cannot be found");
                        ret = OPERATOR_CANCELLED;
                }
 
                        ret = OPERATOR_CANCELLED;
                }
 
@@ -973,12 +973,12 @@ static int edittranslation_exec(bContext *C, wmOperator *op)
                uiStringInfo rna_ctxt = {BUT_GET_RNA_LABEL_CONTEXT, NULL};
 
                if (!BLI_is_dir(root)) {
                uiStringInfo rna_ctxt = {BUT_GET_RNA_LABEL_CONTEXT, NULL};
 
                if (!BLI_is_dir(root)) {
-                       BKE_report(op->reports, RPT_ERROR, "Please set your User Preferences' \"Translation Branches "
-                                                          "Directory\" path to a valid directory");
+                       BKE_report(op->reports, RPT_ERROR, "Please set your User Preferences' 'Translation Branches "
+                                                          "Directory' path to a valid directory");
                        return OPERATOR_CANCELLED;
                }
                if (!WM_operatortype_find(EDTSRC_I18N_OP_NAME, 0)) {
                        return OPERATOR_CANCELLED;
                }
                if (!WM_operatortype_find(EDTSRC_I18N_OP_NAME, 0)) {
-                       BKE_reportf(op->reports, RPT_ERROR, "Could not find operator \"%s\"! Please enable ui_translate addon "
+                       BKE_reportf(op->reports, RPT_ERROR, "Could not find operator '%s'! Please enable ui_translate addon "
                                                            "in the User Preferences", EDTSRC_I18N_OP_NAME);
                        return OPERATOR_CANCELLED;
                }
                                                            "in the User Preferences", EDTSRC_I18N_OP_NAME);
                        return OPERATOR_CANCELLED;
                }
index 262f81abacb22833b7fae5ccb733ec1924c3c4a1..8e5c89adfca8e7227e44e81d9df2a9a878f52059 100644 (file)
@@ -419,7 +419,7 @@ static int ringcut_invoke(bContext *C, wmOperator *op, wmEvent *evt)
        float dist = 75.0f;
 
        if (modifiers_isDeformedByLattice(obedit) || modifiers_isDeformedByArmature(obedit))
        float dist = 75.0f;
 
        if (modifiers_isDeformedByLattice(obedit) || modifiers_isDeformedByArmature(obedit))
-               BKE_report(op->reports, RPT_WARNING, "Loop cut doesn't work well on deformed edit mesh display");
+               BKE_report(op->reports, RPT_WARNING, "Loop cut does not work well on deformed edit mesh display");
        
        view3d_operator_needs_opengl(C);
 
        
        view3d_operator_needs_opengl(C);
 
index 8fe2aa4b1a71d6121d25d12c0cea2319a749c6f8..f12e5ddfadbe11fea0fd3fd7ec7b7360627b40c0 100644 (file)
@@ -1007,7 +1007,7 @@ static int edbm_rip_invoke(bContext *C, wmOperator *op, wmEvent *event)
                 * with modified selection */
                // WM_operator_name_call(C, "MESH_OT_region_to_loop", WM_OP_INVOKE_DEFAULT, NULL);
 
                 * with modified selection */
                // WM_operator_name_call(C, "MESH_OT_region_to_loop", WM_OP_INVOKE_DEFAULT, NULL);
 
-               BKE_report(op->reports, RPT_ERROR, "Can't rip selected faces");
+               BKE_report(op->reports, RPT_ERROR, "Cannot rip selected faces");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index c0c4be3ec776774944d5e0cc47492cc604545a0f..03c88c4a9da0543d1a646cef7bd0db11de1f7d48 100644 (file)
@@ -2472,7 +2472,7 @@ static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
         */
        
        if (em->selectmode == SCE_SELECT_FACE) {
         */
        
        if (em->selectmode == SCE_SELECT_FACE) {
-               BKE_report(op->reports, RPT_ERROR, "Doesn't work in face selection mode");
+               BKE_report(op->reports, RPT_ERROR, "Does not work in face selection mode");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
index dd0cc08bf371cbad2123af26cffee29c14b791eb..fd3eabdaec37b35e11e2834c136c1a82f4524306 100644 (file)
@@ -3559,9 +3559,9 @@ void MESH_OT_dissolve_limited(wmOperatorType *ot)
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        prop = RNA_def_float_rotation(ot->srna, "angle_limit", 0, NULL, 0.0f, DEG2RADF(180.0f),
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        prop = RNA_def_float_rotation(ot->srna, "angle_limit", 0, NULL, 0.0f, DEG2RADF(180.0f),
-                                     "Max Angle", "Angle Limit in Degrees", 0.0f, DEG2RADF(180.0f));
+                                     "Max Angle", "Angle limit", 0.0f, DEG2RADF(180.0f));
        RNA_def_property_float_default(prop, DEG2RADF(15.0f));
        RNA_def_property_float_default(prop, DEG2RADF(15.0f));
-       RNA_def_boolean(ot->srna, "use_dissolve_boundaries", 0, "All Boundries",
+       RNA_def_boolean(ot->srna, "use_dissolve_boundaries", 0, "All Boundaries",
                        "Dissolve all vertices inbetween face boundaries");
 }
 
                        "Dissolve all vertices inbetween face boundaries");
 }
 
index 9feaafbd857f2a9938d811efe6f8cf182991b7cc..765f93072473c8907913024f9f5f9de11a3832d1 100644 (file)
@@ -113,7 +113,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
        CustomData vdata, edata, fdata, ldata, pdata;
 
        if (scene->obedit) {
        CustomData vdata, edata, fdata, ldata, pdata;
 
        if (scene->obedit) {
-               BKE_report(op->reports, RPT_WARNING, "Cannot join while in editmode");
+               BKE_report(op->reports, RPT_WARNING, "Cannot join while in edit mode");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
index 9a57f9d0ba87cea889ecee299ce9b3089ca00528..9fc4e0a906ddd3320126991770424ba80aefb206 100644 (file)
@@ -2057,11 +2057,11 @@ static int join_exec(bContext *C, wmOperator *op)
        Object *ob = CTX_data_active_object(C);
 
        if (scene->obedit) {
        Object *ob = CTX_data_active_object(C);
 
        if (scene->obedit) {
-               BKE_report(op->reports, RPT_ERROR, "This data does not support joining in editmode");
+               BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
                return OPERATOR_CANCELLED;
        }
        else if (BKE_object_obdata_is_libdata(ob)) {
                return OPERATOR_CANCELLED;
        }
        else if (BKE_object_obdata_is_libdata(ob)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata");
+               BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -2111,11 +2111,11 @@ static int join_shapes_exec(bContext *C, wmOperator *op)
        Object *ob = CTX_data_active_object(C);
 
        if (scene->obedit) {
        Object *ob = CTX_data_active_object(C);
 
        if (scene->obedit) {
-               BKE_report(op->reports, RPT_ERROR, "This data does not support joining in editmode");
+               BKE_report(op->reports, RPT_ERROR, "This data does not support joining in edit mode");
                return OPERATOR_CANCELLED;
        }
        else if (BKE_object_obdata_is_libdata(ob)) {
                return OPERATOR_CANCELLED;
        }
        else if (BKE_object_obdata_is_libdata(ob)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata");
+               BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 09c80bdc3dc22f37cec10aa97546e12e4fa7730a..2914a1ff6739bd898906cbab875b5daa06a03dd0 100644 (file)
@@ -967,7 +967,7 @@ static int multiresbake_check(bContext *C, wmOperator *op)
                }
 
                if (mmd->lvl == 0) {
                }
 
                if (mmd->lvl == 0) {
-                       BKE_report(op->reports, RPT_ERROR, "Multires data baking is not support for preview subdivision level 0");
+                       BKE_report(op->reports, RPT_ERROR, "Multires data baking is not supported for preview subdivision level 0");
 
                        break;
                }
 
                        break;
                }
index 1b486f589aebde8d3e7ce0e84a692a06b55b2a3d..f78e1203bc483614c429c4a08ae34fec8ddc6359 100644 (file)
@@ -807,7 +807,7 @@ static int childof_set_inverse_exec(bContext *C, wmOperator *op)
        /* despite 3 layers of checks, we may still not be able to find a constraint */
        if (data == NULL) {
                printf("DEBUG: Child-Of Set Inverse - object = '%s'\n", (ob) ? ob->id.name + 2 : "<None>");
        /* despite 3 layers of checks, we may still not be able to find a constraint */
        if (data == NULL) {
                printf("DEBUG: Child-Of Set Inverse - object = '%s'\n", (ob) ? ob->id.name + 2 : "<None>");
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find constraint data for Child-Of Set Inverse");
+               BKE_report(op->reports, RPT_ERROR, "Could not find constraint data for Child-Of Set Inverse");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -1028,7 +1028,7 @@ static int objectsolver_set_inverse_exec(bContext *C, wmOperator *op)
        /* despite 3 layers of checks, we may still not be able to find a constraint */
        if (data == NULL) {
                printf("DEBUG: Child-Of Set Inverse - object = '%s'\n", (ob) ? ob->id.name + 2 : "<None>");
        /* despite 3 layers of checks, we may still not be able to find a constraint */
        if (data == NULL) {
                printf("DEBUG: Child-Of Set Inverse - object = '%s'\n", (ob) ? ob->id.name + 2 : "<None>");
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find constraint data for Child-Of Set Inverse");
+               BKE_report(op->reports, RPT_ERROR, "Could not find constraint data for Child-Of Set Inverse");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -1628,15 +1628,15 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
                return OPERATOR_CANCELLED;
        }
        if ((type == CONSTRAINT_TYPE_RIGIDBODYJOINT) && (list != &ob->constraints)) {
                return OPERATOR_CANCELLED;
        }
        if ((type == CONSTRAINT_TYPE_RIGIDBODYJOINT) && (list != &ob->constraints)) {
-               BKE_report(op->reports, RPT_ERROR, "Rigid Body Joint Constraint can only be added to Objects");
+               BKE_report(op->reports, RPT_ERROR, "Rigid Body Joint constraint can only be added to objects");
                return OPERATOR_CANCELLED;
        }
        if ((type == CONSTRAINT_TYPE_KINEMATIC) && ((!pchan) || (list != &pchan->constraints))) {
                return OPERATOR_CANCELLED;
        }
        if ((type == CONSTRAINT_TYPE_KINEMATIC) && ((!pchan) || (list != &pchan->constraints))) {
-               BKE_report(op->reports, RPT_ERROR, "IK Constraint can only be added to Bones");
+               BKE_report(op->reports, RPT_ERROR, "IK constraint can only be added to bones");
                return OPERATOR_CANCELLED;
        }
        if ((type == CONSTRAINT_TYPE_SPLINEIK) && ((!pchan) || (list != &pchan->constraints))) {
                return OPERATOR_CANCELLED;
        }
        if ((type == CONSTRAINT_TYPE_SPLINEIK) && ((!pchan) || (list != &pchan->constraints))) {
-               BKE_report(op->reports, RPT_ERROR, "Spline IK Constraint can only be added to Bones");
+               BKE_report(op->reports, RPT_ERROR, "Spline IK constraint can only be added to bones");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -1856,7 +1856,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(evt))
        
        /* must have active bone */
        if (ELEM(NULL, ob, pchan)) {
        
        /* must have active bone */
        if (ELEM(NULL, ob, pchan)) {
-               BKE_report(op->reports, RPT_ERROR, "Must have active bone to add IK Constraint to");
+               BKE_report(op->reports, RPT_ERROR, "Must have an active bone to add IK constraint to");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -1865,7 +1865,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(evt))
                if (con->type == CONSTRAINT_TYPE_KINEMATIC) break;
        }
        if (con) {
                if (con->type == CONSTRAINT_TYPE_KINEMATIC) break;
        }
        if (con) {
-               BKE_report(op->reports, RPT_ERROR, "Bone already has IK Constraint");
+               BKE_report(op->reports, RPT_ERROR, "Bone already has an IK constraint");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
index e8d388bb8121fbcf8de925a127767d7d4c9aed9a..a3bf27a19d6543ffe3c12f9c5b640dbf0a4cd858 100644 (file)
@@ -195,7 +195,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
                }
        }
        
                }
        }
        
-       if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+       if (!ok) BKE_report(op->reports, RPT_ERROR, "Active object contains no groups");
        
        DAG_scene_sort(bmain, scene);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
        
        DAG_scene_sort(bmain, scene);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
index 1332d9b19a3f072692727ab4b1cfc0aeaabd85ef..caeff1e82a7e608129610eb9b638a630d2c87561 100644 (file)
@@ -515,12 +515,12 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op)
        CTX_DATA_END;
        
        if (!obsel) {
        CTX_DATA_END;
        
        if (!obsel) {
-               BKE_report(op->reports, RPT_ERROR, "Can't add hook with no other selected objects");
+               BKE_report(op->reports, RPT_ERROR, "Cannot add hook with no other selected objects");
                return OPERATOR_CANCELLED;
        }
 
        if (use_bone && obsel->type != OB_ARMATURE) {
                return OPERATOR_CANCELLED;
        }
 
        if (use_bone && obsel->type != OB_ARMATURE) {
-               BKE_report(op->reports, RPT_ERROR, "Can't add hook bone for a non armature object");
+               BKE_report(op->reports, RPT_ERROR, "Cannot add hook bone for a non armature object");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -590,7 +590,7 @@ static int object_hook_remove_exec(bContext *C, wmOperator *op)
 
        hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        if (!hmd) {
 
        hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        if (!hmd) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find hook modifier");
+               BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -673,7 +673,7 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op)
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find hook modifier");
+               BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -741,7 +741,7 @@ static int object_hook_recenter_exec(bContext *C, wmOperator *op)
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find hook modifier");
+               BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -799,7 +799,7 @@ static int object_hook_assign_exec(bContext *C, wmOperator *op)
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find hook modifier");
+               BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -861,7 +861,7 @@ static int object_hook_select_exec(bContext *C, wmOperator *op)
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
                hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
        }
        if (!ob || !hmd) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find hook modifier");
+               BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
index 020705069376dd3b8f4398874c6fc22eedd840fb..3d2c4f95624ca263e68e8df67a4c636325f6814b 100644 (file)
@@ -99,13 +99,13 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc
        
        /* only geometry objects should be able to get modifiers [#25291] */
        if (!ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) {
        
        /* only geometry objects should be able to get modifiers [#25291] */
        if (!ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) {
-               BKE_reportf(reports, RPT_WARNING, "Modifiers cannot be added to Object '%s'", ob->id.name + 2);
+               BKE_reportf(reports, RPT_WARNING, "Modifiers cannot be added to object '%s'", ob->id.name + 2);
                return NULL;
        }
        
        if (mti->flags & eModifierTypeFlag_Single) {
                if (modifiers_findByType(ob, type)) {
                return NULL;
        }
        
        if (mti->flags & eModifierTypeFlag_Single) {
                if (modifiers_findByType(ob, type)) {
-                       BKE_report(reports, RPT_WARNING, "Only one modifier of this type allowed");
+                       BKE_report(reports, RPT_WARNING, "Only one modifier of this type is allowed");
                        return NULL;
                }
        }
                        return NULL;
                }
        }
@@ -556,7 +556,7 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M
                KeyBlock *kb;
                
                if (!modifier_sameTopology(md) || mti->type == eModifierTypeType_NonGeometrical) {
                KeyBlock *kb;
                
                if (!modifier_sameTopology(md) || mti->type == eModifierTypeType_NonGeometrical) {
-                       BKE_report(reports, RPT_ERROR, "Only deforming modifiers can be applied to Shapes");
+                       BKE_report(reports, RPT_ERROR, "Only deforming modifiers can be applied to shapes");
                        return 0;
                }
                
                        return 0;
                }
                
@@ -604,7 +604,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
                MultiresModifierData *mmd = find_multires_modifier_before(scene, md);
 
                if (me->key && mti->type != eModifierTypeType_NonGeometrical) {
                MultiresModifierData *mmd = find_multires_modifier_before(scene, md);
 
                if (me->key && mti->type != eModifierTypeType_NonGeometrical) {
-                       BKE_report(reports, RPT_ERROR, "Modifier cannot be applied to Mesh with Shape Keys");
+                       BKE_report(reports, RPT_ERROR, "Modifier cannot be applied to a mesh with shape keys");
                        return 0;
                }
 
                        return 0;
                }
 
@@ -681,7 +681,7 @@ int ED_object_modifier_apply(ReportList *reports, Scene *scene, Object *ob, Modi
        int prev_mode;
 
        if (scene->obedit) {
        int prev_mode;
 
        if (scene->obedit) {
-               BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied in editmode");
+               BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied in edit mode");
                return 0;
        }
        else if (((ID *) ob->data)->us > 1) {
                return 0;
        }
        else if (((ID *) ob->data)->us > 1) {
index 4e1eaea70e426061413ba811deef3a6660edf226..58c6959d6f02c8851b0e92d7c1131c5493087a41 100644 (file)
@@ -628,7 +628,7 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
                pchan = BKE_pose_channel_active(par);
                
                if (pchan == NULL) {
                pchan = BKE_pose_channel_active(par);
                
                if (pchan == NULL) {
-                       BKE_report(reports, RPT_ERROR, "No active Bone");
+                       BKE_report(reports, RPT_ERROR, "No active bone");
                        return 0;
                }
        }
                        return 0;
                }
        }
@@ -1036,7 +1036,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
        int type = RNA_enum_get(op->ptr, "type");
 
        if (CTX_data_edit_object(C)) {
        int type = RNA_enum_get(op->ptr, "type");
 
        if (CTX_data_edit_object(C)) {
-               BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
+               BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in edit mode");
                return OPERATOR_CANCELLED;
        }
        CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
                return OPERATOR_CANCELLED;
        }
        CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
@@ -1350,17 +1350,17 @@ static int make_links_scene_exec(bContext *C, wmOperator *op)
        Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene"));
 
        if (scene_to == NULL) {
        Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene"));
 
        if (scene_to == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't find scene");
+               BKE_report(op->reports, RPT_ERROR, "Could not find scene");
                return OPERATOR_CANCELLED;
        }
 
        if (scene_to == CTX_data_scene(C)) {
                return OPERATOR_CANCELLED;
        }
 
        if (scene_to == CTX_data_scene(C)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't link objects into the same scene");
+               BKE_report(op->reports, RPT_ERROR, "Cannot link objects into the same scene");
                return OPERATOR_CANCELLED;
        }
 
        if (scene_to->id.lib) {
                return OPERATOR_CANCELLED;
        }
 
        if (scene_to->id.lib) {
-               BKE_report(op->reports, RPT_ERROR, "Can't link objects into a linked scene");
+               BKE_report(op->reports, RPT_ERROR, "Cannot link objects into a linked scene");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 687ce35f6d748b5dc44449cebad40468fdb5bb54..2aa737d204dd5c429293bfeb1184bae90c64ca1b 100644 (file)
@@ -425,7 +425,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
        
        ob = OBACT;
        if (ob == NULL) {
        
        ob = OBACT;
        if (ob == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No Active Object");
+               BKE_report(op->reports, RPT_ERROR, "No active object");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -800,7 +800,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
        
        ob = OBACT;
        if (ob == NULL) {
        
        ob = OBACT;
        if (ob == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No Active Object");
+               BKE_report(op->reports, RPT_ERROR, "No active object");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
index 58931d3e3410e0d637e2b54bfc7efcc456fa5620..4476296866e941b91d42b4e9d4777ccd21d50b85 100644 (file)
@@ -217,7 +217,7 @@ static int object_clear_transform_generic_exec(bContext *C, wmOperator *op,
        
        /* sanity checks */
        if (ELEM(NULL, clear_func, default_ksName)) {
        
        /* sanity checks */
        if (ELEM(NULL, clear_func, default_ksName)) {
-               BKE_report(op->reports, RPT_ERROR, "Programming error: missing clear transform function or Keying Set Name");
+               BKE_report(op->reports, RPT_ERROR, "Programming error: missing clear transform function or keying set name");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -390,19 +390,19 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
 
                if (ob->type == OB_MESH) {
                        if (ID_REAL_USERS(ob->data) > 1) {
 
                if (ob->type == OB_MESH) {
                        if (ID_REAL_USERS(ob->data) > 1) {
-                               BKE_report(reports, RPT_ERROR, "Can't apply to a multi user mesh, doing nothing");
+                               BKE_report(reports, RPT_ERROR, "Cannot apply to a multi user mesh, doing nothing");
                                change = 0;
                        }
                }
                else if (ob->type == OB_ARMATURE) {
                        if (ID_REAL_USERS(ob->data) > 1) {
                                change = 0;
                        }
                }
                else if (ob->type == OB_ARMATURE) {
                        if (ID_REAL_USERS(ob->data) > 1) {
-                               BKE_report(reports, RPT_ERROR, "Can't apply to a multi user armature, doing nothing");
+                               BKE_report(reports, RPT_ERROR, "Cannot apply to a multi user armature, doing nothing");
                                change = 0;
                        }
                }
                else if (ob->type == OB_LATTICE) {
                        if (ID_REAL_USERS(ob->data) > 1) {
                                change = 0;
                        }
                }
                else if (ob->type == OB_LATTICE) {
                        if (ID_REAL_USERS(ob->data) > 1) {
-                               BKE_report(reports, RPT_ERROR, "Can't apply to a multi user lattice, doing nothing");
+                               BKE_report(reports, RPT_ERROR, "Cannot apply to a multi user lattice, doing nothing");
                                change = 0;
                        }
                }
                                change = 0;
                        }
                }
@@ -410,7 +410,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
                        Curve *cu;
 
                        if (ID_REAL_USERS(ob->data) > 1) {
                        Curve *cu;
 
                        if (ID_REAL_USERS(ob->data) > 1) {
-                               BKE_report(reports, RPT_ERROR, "Can't apply to a multi user curve, doing nothing");
+                               BKE_report(reports, RPT_ERROR, "Cannot apply to a multi user curve, doing nothing");
                                change = 0;
                        }
 
                                change = 0;
                        }
 
@@ -422,7 +422,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo
                                change = 0;
                        }
                        if (cu->key) {
                                change = 0;
                        }
                        if (cu->key) {
-                               BKE_report(reports, RPT_ERROR, "Can't apply to a curve with vertex keys, doing nothing");
+                               BKE_report(reports, RPT_ERROR, "Cannot apply to a curve with vertex keys, doing nothing");
                                change = 0;
                        }
                }
                                change = 0;
                        }
                }
@@ -672,7 +672,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
        int tot_change = 0, tot_lib_error = 0, tot_multiuser_arm_error = 0;
 
        if (obedit && centermode != GEOMETRY_TO_ORIGIN) {
        int tot_change = 0, tot_lib_error = 0, tot_multiuser_arm_error = 0;
 
        if (obedit && centermode != GEOMETRY_TO_ORIGIN) {
-               BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in EditMode");
+               BKE_report(op->reports, RPT_ERROR, "Operation cannot be performed in edit mode");
                return OPERATOR_CANCELLED;
        }
        else {
                return OPERATOR_CANCELLED;
        }
        else {
@@ -854,7 +854,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
                                if (ID_REAL_USERS(arm) > 1) {
 #if 0
 
                                if (ID_REAL_USERS(arm) > 1) {
 #if 0
-                                       BKE_report(op->reports, RPT_ERROR, "Can't apply to a multi user armature");
+                                       BKE_report(op->reports, RPT_ERROR, "Cannot apply to a multi user armature");
                                        return;
 #endif
                                        tot_multiuser_arm_error++;
                                        return;
 #endif
                                        tot_multiuser_arm_error++;
index 3d96ea117158592a9f8cf661c220b94d40f1909f..6c2503e3d673aa6ab0dc9840ac7f2c0c0ceebdbe 100644 (file)
@@ -3470,7 +3470,7 @@ static int vgroup_do_remap(Object *ob, char *name_array, wmOperator *op)
                        }
                }
                else {
                        }
                }
                else {
-                       BKE_report(op->reports, RPT_ERROR, "Editmode lattice isn't supported yet");
+                       BKE_report(op->reports, RPT_ERROR, "Editmode lattice is not supported yet");
                        MEM_freeN(sort_map_update);
                        return OPERATOR_CANCELLED;
                }
                        MEM_freeN(sort_map_update);
                        return OPERATOR_CANCELLED;
                }
index 4d43c6185685eeb7d1a1d6c4183e938967bc086e..da12a26e747c4b8027e8f5f7e9d8594ba937f751 100644 (file)
@@ -20,6 +20,7 @@
 
 set(INC
        ../include
 
 set(INC
        ../include
+       ../../blenfont
        ../../blenkernel
        ../../blenlib
        ../../blenloader
        ../../blenkernel
        ../../blenlib
        ../../blenloader
@@ -54,4 +55,8 @@ if(WITH_OPENMP)
        add_definitions(-DPARALLEL=1)
 endif()
 
        add_definitions(-DPARALLEL=1)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")
 blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")
index 9fe6cff434989116c4d7f39f4f052c0864c6c209..fffe05d6a0dc0a6c31ac3c4d1427f3a9e8fb1f62 100644 (file)
@@ -3,12 +3,12 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../gpu ../../blenloader ../../bmesh'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../gpu ../../blenloader ../../bmesh'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
-defs = ''
+defs = []
 
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
 
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
@@ -17,9 +17,11 @@ if env['OURPLATFORM'] == 'linux':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-
 if env['OURPLATFORM'] == 'darwin':
     if env['WITH_BF_OPENMP']:
 if env['OURPLATFORM'] == 'darwin':
     if env['WITH_BF_OPENMP']:
-       defs += ' PARALLEL=1'
+       defs.append('PARALLEL=1')
+
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
 
 
-env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), Split(defs), libtype=['core'], priority=[45] )
+env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), defs, libtype=['core'], priority=[45] )
index 467ad5c6ff9d50d139ef5482119451a74585a825..c51b3ca4c43485f77ebf08fe8d6d2cb05cb8b7fb 100644 (file)
@@ -26,6 +26,8 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
@@ -280,7 +282,10 @@ static int dynamicPaint_bakeImageSequence(bContext *C, DynamicPaintSurface *surf
        int frames;
 
        frames = surface->end_frame - surface->start_frame + 1;
        int frames;
 
        frames = surface->end_frame - surface->start_frame + 1;
-       if (frames <= 0) {BLI_strncpy(canvas->error, "No frames to bake.", sizeof(canvas->error)); return 0;}
+       if (frames <= 0) {
+               BLI_strncpy(canvas->error, N_("No frames to bake"), sizeof(canvas->error));
+               return 0;
+       }
 
        /* Set frame to start point (also inits modifier data) */
        frame = surface->start_frame;
 
        /* Set frame to start point (also inits modifier data) */
        frame = surface->start_frame;
index 88bd4e829f1f6ce1476d74b2bd26fb7234d614bc..122558997eb05b49f9511e8d3a177591bf039600 100644 (file)
@@ -902,7 +902,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
        /* make sure it corresponds to startFrame setting (old: noFrames = scene->r.efra - scene->r.sfra +1) */;
        noFrames = scene->r.efra - 0;
        if (noFrames<=0) {
        /* make sure it corresponds to startFrame setting (old: noFrames = scene->r.efra - scene->r.sfra +1) */;
        noFrames = scene->r.efra - 0;
        if (noFrames<=0) {
-               BKE_report(reports, RPT_ERROR, "No frames to export - check your animation range settings");
+               BKE_report(reports, RPT_ERROR, "No frames to export (check your animation range settings)");
                fluidbake_free_data(channels, fobjects, fsset, fb);
                return 0;
        }
                fluidbake_free_data(channels, fobjects, fsset, fb);
                return 0;
        }
index 63cf0fcaa3159498dc1adec76f66b943f203c34f..ad9b082d0448d371d6c3960499f612058ba506da 100644 (file)
@@ -202,7 +202,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
        screen_render_scene_layer_set(op, mainp, &scene, &srl);
 
        if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
        screen_render_scene_layer_set(op, mainp, &scene, &srl);
 
        if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected");
+               BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -493,7 +493,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
        }
 
        if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
        }
 
        if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected");
+               BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
index f14b9be303973a2792e249c9446502ecc4f77158..0b6b5cb8e4a542198e5f241ea266684752cabd05 100644 (file)
@@ -308,7 +308,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
        char err_out[256] = "unknown";
 
        if (G.background) {
        char err_out[256] = "unknown";
 
        if (G.background) {
-               BKE_report(op->reports, RPT_ERROR, "Can't use OpenGL render in background mode (no opengl context)");
+               BKE_report(op->reports, RPT_ERROR, "Cannot use OpenGL render in background mode (no opengl context)");
                return 0;
        }
 
                return 0;
        }
 
@@ -329,7 +329,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
        }
 
        if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
        }
 
        if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected");
+               BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
                return 0;
        }
 
                return 0;
        }
 
index cfe32e0550624e7782298ac6755381439c721dfd..bd171ef247ac669ba91f3e6ec8c7c30df240542c 100644 (file)
@@ -2905,10 +2905,10 @@ static void SCREEN_OT_header_toggle_menus(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Show/Hide Header Menus";
        ot->idname = "SCREEN_OT_header_toggle_menus";
        /* identifiers */
        ot->name = "Show/Hide Header Menus";
        ot->idname = "SCREEN_OT_header_toggle_menus";
-       ot->description = "Show or Hide the header pulldown menus";
+       ot->description = "Show or hide the header pulldown menus";
        
        /* api callbacks */
        
        /* api callbacks */
-       ot->exec = header_toggle_menus_exec;    
+       ot->exec = header_toggle_menus_exec;
        ot->poll = ED_operator_areaactive;
        ot->flag = 0;
 }
        ot->poll = ED_operator_areaactive;
        ot->flag = 0;
 }
index 7af0fc27ed7f4b0d3b074eb0da2e6c161b35339c..0ecac5fc4972bd9d5b4113dfad176e590e5d2d82 100644 (file)
@@ -365,7 +365,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
                                
                                if (ok == 0) {
                                        printf("Write error: cannot save %s\n", name);
                                
                                if (ok == 0) {
                                        printf("Write error: cannot save %s\n", name);
-                                       BKE_reportf(&sj->reports, RPT_INFO, "Write error: cannot save %s\n", name);
+                                       BKE_reportf(&sj->reports, RPT_INFO, "Write error: cannot save %s", name);
                                        break;
                                }
                                else {
                                        break;
                                }
                                else {
index 5f05c7f8df822590737b888db398e6f9e5918313..8c8a5ced5d302fe8ce708bde1dc0d3b438849b35 100644 (file)
@@ -5654,7 +5654,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        
        if (BKE_object_obdata_is_libdata(ob)) {
                return OPERATOR_CANCELLED;
        
        if (BKE_object_obdata_is_libdata(ob)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata");
+               BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 1f0711cc4add8f3c5b74a36d96d9f236389320e4..0e2c6fbe3ce8d1af216b8ff74d22b297ab798b86 100644 (file)
@@ -493,7 +493,7 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op)
        /* copy keyframes */
        if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
                /* FIXME... */
        /* copy keyframes */
        if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
                /* FIXME... */
-               BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for Grease Pencil mode");
+               BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for grease pencil mode");
                return OPERATOR_CANCELLED;
        }
        else if (ac.datatype == ANIMCONT_MASK) {
                return OPERATOR_CANCELLED;
        }
        else if (ac.datatype == ANIMCONT_MASK) {
@@ -543,7 +543,7 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op)
        /* paste keyframes */
        if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
                /* FIXME... */
        /* paste keyframes */
        if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
                /* FIXME... */
-               BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for Grease Pencil or Mask mode");
+               BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for grease pencil or mask mode");
                return OPERATOR_CANCELLED;
        }
        else {
                return OPERATOR_CANCELLED;
        }
        else {
index 9a7284de66057e786e3fe343eeb2794aa837a173..d40426a5bc913600ad7e5e13e80b51b3331142bf 100644 (file)
@@ -162,7 +162,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event)
        char *str;
 
        if (CTX_wm_space_file(C)) {
        char *str;
 
        if (CTX_wm_space_file(C)) {
-               BKE_report(op->reports, RPT_ERROR, "Can't activate a file selector, one already open");
+               BKE_report(op->reports, RPT_ERROR, "Cannot activate a file selector, one already open");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 1a9cae93a388f5360b9ddcb11ab7653cdfae8ca4..9ec2ad82bef68082d19fa35728abe1f6bbd58fba 100644 (file)
@@ -197,8 +197,8 @@ static int open_exec(bContext *C, wmOperator *op)
                if (op->customdata)
                        MEM_freeN(op->customdata);
 
                if (op->customdata)
                        MEM_freeN(op->customdata);
 
-               BKE_reportf(op->reports, RPT_ERROR, "Can't read \"%s\": %s", str,
-                           errno ? strerror(errno) : TIP_("Unsupported movie clip format"));
+               BKE_reportf(op->reports, RPT_ERROR, "Cannot read '%s': %s", str,
+                           errno ? strerror(errno) : TIP_("unsupported movie clip format"));
 
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
index 2f1265b6a4da4247e6c40a19b247df086ce293fb..f98acf8097d5c7ff662796969f32500d4df0938b 100644 (file)
@@ -1397,7 +1397,7 @@ static void solve_camera_freejob(void *scv)
 
        solved = BKE_tracking_reconstruction_finish(scj->context, tracking);
        if (!solved)
 
        solved = BKE_tracking_reconstruction_finish(scj->context, tracking);
        if (!solved)
-               BKE_report(scj->reports, RPT_WARNING, "Some data failed to reconstruct, see console for details");
+               BKE_report(scj->reports, RPT_WARNING, "Some data failed to reconstruct (see console for details)");
        else
                BKE_reportf(scj->reports, RPT_INFO, "Average re-projection error: %.3f", tracking->reconstruction.error);
 
        else
                BKE_reportf(scj->reports, RPT_INFO, "Average re-projection error: %.3f", tracking->reconstruction.error);
 
@@ -3371,7 +3371,7 @@ static int tracking_object_remove_exec(bContext *C, wmOperator *op)
        object = BKE_tracking_object_get_active(tracking);
 
        if (object->flag & TRACKING_OBJECT_CAMERA) {
        object = BKE_tracking_object_get_active(tracking);
 
        if (object->flag & TRACKING_OBJECT_CAMERA) {
-               BKE_report(op->reports, RPT_WARNING, "Object used for camera tracking can't be deleted");
+               BKE_report(op->reports, RPT_WARNING, "Object used for camera tracking cannot be deleted");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 52d4a6a86c196e152eeeb729ff907c2709bc5b66..763b18788de9291ebe4853a596b6da9e53adc4d0 100644 (file)
@@ -1105,7 +1105,7 @@ int file_directory_new_exec(bContext *C, wmOperator *op)
        if (generate_name) {
                /* create a new, non-existing folder name */
                if (!new_folder_path(sfile->params->dir, path, name)) {
        if (generate_name) {
                /* create a new, non-existing folder name */
                if (!new_folder_path(sfile->params->dir, path, name)) {
-                       BKE_report(op->reports, RPT_ERROR, "Couldn't create new folder name");
+                       BKE_report(op->reports, RPT_ERROR, "Could not create new folder name");
                        return OPERATOR_CANCELLED;
                }
        }
                        return OPERATOR_CANCELLED;
                }
        }
@@ -1114,7 +1114,7 @@ int file_directory_new_exec(bContext *C, wmOperator *op)
        BLI_dir_create_recursive(path);
 
        if (!BLI_exists(path)) {
        BLI_dir_create_recursive(path);
 
        if (!BLI_exists(path)) {
-               BKE_report(op->reports, RPT_ERROR, "Couldn't create new folder");
+               BKE_report(op->reports, RPT_ERROR, "Could not create new folder");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 3b14257cdb42b31e51e998811dffd1058e61198d..c7f9bd87a1bd562aea5b72d6ca30c041b83c7dd5 100644 (file)
@@ -39,6 +39,8 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "DNA_object_types.h"
 #include "DNA_node_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_object_types.h"
 #include "DNA_node_types.h"
 #include "DNA_packedFile_types.h"
@@ -858,7 +860,8 @@ static int image_open_exec(bContext *C, wmOperator *op)
 
        if (!ima) {
                if (op->customdata) MEM_freeN(op->customdata);
 
        if (!ima) {
                if (op->customdata) MEM_freeN(op->customdata);
-               BKE_reportf(op->reports, RPT_ERROR, "Can't read: \"%s\", %s", str, errno ? strerror(errno) : "Unsupported image format");
+               BKE_reportf(op->reports, RPT_ERROR, "Cannot read '%s': %s",
+                           str, errno ? strerror(errno) : TIP_("unsupported image format"));
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -1313,7 +1316,7 @@ static void save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
                        }
                }
                else {
                        }
                }
                else {
-                       BKE_reportf(op->reports, RPT_ERROR, "Couldn't write image: %s", simopts->filepath);
+                       BKE_reportf(op->reports, RPT_ERROR, "Could not write image %s", simopts->filepath);
                }
 
 
                }
 
 
@@ -1495,7 +1498,7 @@ static int image_save_exec(bContext *C, wmOperator *op)
                save_image_doit(C, sima, op, &simopts, FALSE);
        }
        else {
                save_image_doit(C, sima, op, &simopts, FALSE);
        }
        else {
-               BKE_reportf(op->reports, RPT_ERROR, "Can not save image, path '%s' is not writable", simopts.filepath);
+               BKE_reportf(op->reports, RPT_ERROR, "Cannot save image, path '%s' is not writable", simopts.filepath);
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -1536,7 +1539,7 @@ static int image_save_sequence_exec(bContext *C, wmOperator *op)
        }
 
        if (sima->image->type == IMA_TYPE_MULTILAYER) {
        }
 
        if (sima->image->type == IMA_TYPE_MULTILAYER) {
-               BKE_report(op->reports, RPT_ERROR, "Can't save multilayer sequences");
+               BKE_report(op->reports, RPT_ERROR, "Cannot save multilayer sequences");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -1572,7 +1575,7 @@ static int image_save_sequence_exec(bContext *C, wmOperator *op)
                                break;
                        }
 
                                break;
                        }
 
-                       BKE_reportf(op->reports, RPT_INFO, "Saved: %s\n", ibuf->name);
+                       BKE_reportf(op->reports, RPT_INFO, "Saved %s", ibuf->name);
                        ibuf->userflags &= ~IB_BITMAPDIRTY;
                }
        }
                        ibuf->userflags &= ~IB_BITMAPDIRTY;
                }
        }
@@ -1852,7 +1855,7 @@ static int image_pack_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        
        if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
                return OPERATOR_CANCELLED;
        
        if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
-               BKE_report(op->reports, RPT_ERROR, "Can't pack edited image from disk, only as internal PNG");
+               BKE_report(op->reports, RPT_ERROR, "Cannot pack edited image from disk, only as internal PNG");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index bb2d55fa0f62b5c69bdabe42df40a7799a57fd93..131908bc9dbb6be9c1f7a02e1e833353a697e41d 100644 (file)
@@ -196,7 +196,7 @@ static int make_paths_relative_exec(bContext *C, wmOperator *op)
        Main *bmain = CTX_data_main(C);
 
        if (!G.relbase_valid) {
        Main *bmain = CTX_data_main(C);
 
        if (!G.relbase_valid) {
-               BKE_report(op->reports, RPT_WARNING, "Can't set relative paths with an unsaved blend file");
+               BKE_report(op->reports, RPT_WARNING, "Cannot set relative paths with an unsaved blend file");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -229,7 +229,7 @@ static int make_paths_absolute_exec(bContext *C, wmOperator *op)
        Main *bmain = CTX_data_main(C);
 
        if (!G.relbase_valid) {
        Main *bmain = CTX_data_main(C);
 
        if (!G.relbase_valid) {
-               BKE_report(op->reports, RPT_WARNING, "Can't set absolute paths with an unsaved blend file");
+               BKE_report(op->reports, RPT_WARNING, "Cannot set absolute paths with an unsaved blend file");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 92956b7aa5b18ebb45d799f1703fbb96463b17d9..3740c3fae5e578b1404c1e27c8d916c1c20b4a42 100644 (file)
@@ -398,7 +398,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
        act = BLI_findlink(&CTX_data_main(C)->action, RNA_enum_get(op->ptr, "action"));
        
        if (act == NULL) {
        act = BLI_findlink(&CTX_data_main(C)->action, RNA_enum_get(op->ptr, "action"));
        
        if (act == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No valid Action to add");
+               BKE_report(op->reports, RPT_ERROR, "No valid action to add");
                //printf("Add strip - actname = '%s'\n", actname);
                return OPERATOR_CANCELLED;
        }
                //printf("Add strip - actname = '%s'\n", actname);
                return OPERATOR_CANCELLED;
        }
@@ -407,7 +407,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
                BKE_reportf(op->reports, RPT_WARNING,
                            "Action '%s' does not specify what datablocks it can be used on "
                            "(try setting the 'ID Root Type' setting from the Datablocks Editor "
                BKE_reportf(op->reports, RPT_WARNING,
                            "Action '%s' does not specify what datablocks it can be used on "
                            "(try setting the 'ID Root Type' setting from the Datablocks Editor "
-                           "for this Action to avoid future problems)",
+                           "for this action to avoid future problems)",
                            act->id.name + 2);
        }
        
                            act->id.name + 2);
        }
        
@@ -433,7 +433,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
                 */
                if ((act->idroot) && (act->idroot != GS(ale->id->name))) {
                        BKE_reportf(op->reports, RPT_ERROR, 
                 */
                if ((act->idroot) && (act->idroot != GS(ale->id->name))) {
                        BKE_reportf(op->reports, RPT_ERROR, 
-                                   "Couldn't add action '%s' as it cannot be used relative to ID-blocks of type '%s'",
+                                   "Could not add action '%s' as it cannot be used relative to ID-blocks of type '%s'",
                                    act->id.name + 2, ale->id->name);
                        continue;
                }
                                    act->id.name + 2, ale->id->name);
                        continue;
                }
@@ -2023,7 +2023,7 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op)
                                set_active_fmodifier(&strip->modifiers, fcm);
                        else {
                                BKE_reportf(op->reports, RPT_ERROR,
                                set_active_fmodifier(&strip->modifiers, fcm);
                        else {
                                BKE_reportf(op->reports, RPT_ERROR,
-                                           "Modifier couldn't be added to (%s : %s) (see console for details)",
+                                           "Modifier could not be added to (%s : %s) (see console for details)",
                                            nlt->name, strip->name);
                        }
                }
                                            nlt->name, strip->name);
                        }
                }
index 99d49fa1e8f4fcd22596c80f7946c1a8a7097d09..df8a6f94d247b9dc52f44f37d035f38278d1d99b 100644 (file)
@@ -35,6 +35,8 @@
 
 #include "BLI_math.h"
 
 
 #include "BLI_math.h"
 
+#include "BLF_translation.h"
+
 #include "BKE_context.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
 #include "BKE_context.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
@@ -240,7 +242,8 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
                ima = BKE_image_load_exists(path);
 
                if (!ima) {
                ima = BKE_image_load_exists(path);
 
                if (!ima) {
-                       BKE_reportf(op->reports, RPT_ERROR, "Can't read image: \"%s\", %s", path, errno ? strerror(errno) : "Unsupported format");
+                       BKE_reportf(op->reports, RPT_ERROR, "Cannot read image '%s': %s",
+                                   path, errno ? strerror(errno) : TIP_("unsupported format"));
                        return OPERATOR_CANCELLED;
                }
        }
                        return OPERATOR_CANCELLED;
                }
        }
@@ -250,7 +253,7 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
                ima = (Image *)BKE_libblock_find_name(ID_IM, name);
 
                if (!ima) {
                ima = (Image *)BKE_libblock_find_name(ID_IM, name);
 
                if (!ima) {
-                       BKE_reportf(op->reports, RPT_ERROR, "Image named \"%s\", not found", name);
+                       BKE_reportf(op->reports, RPT_ERROR, "Image '%s' not found", name);
                        return OPERATOR_CANCELLED;
                }
        }
                        return OPERATOR_CANCELLED;
                }
        }
index cb3445739df43e7aa8041298cfa5a591b3a89b0a..23766d6a6fee9aa52683a4e23a71ba82b17b1bda 100644 (file)
@@ -786,7 +786,7 @@ static void outliner_find_panel(Scene *UNUSED(scene), ARegion *ar, SpaceOops *so
        }
        else {
                /* no tree-element found */
        }
        else {
                /* no tree-element found */
-               BKE_report(reports, RPT_WARNING, "Not found: %s", name);
+               BKE_reportf(reports, RPT_WARNING, "Not found: %s", name);
        }
 }
 #endif
        }
 }
 #endif
index 32013dd276769c602d23152519bbe66ecedd152d..5fb9780c7002b96a3b1d4f3c9c422c2ee5afd8f1 100644 (file)
@@ -974,7 +974,7 @@ static int outliner_action_set_exec(bContext *C, wmOperator *op)
        act = BLI_findlink(&CTX_data_main(C)->action, RNA_enum_get(op->ptr, "action"));
        
        if (act == NULL) {
        act = BLI_findlink(&CTX_data_main(C)->action, RNA_enum_get(op->ptr, "action"));
        
        if (act == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No valid Action to add");
+               BKE_report(op->reports, RPT_ERROR, "No valid action to add");
                return OPERATOR_CANCELLED;
        }
        else if (act->idroot == 0) {
                return OPERATOR_CANCELLED;
        }
        else if (act->idroot == 0) {
@@ -982,7 +982,7 @@ static int outliner_action_set_exec(bContext *C, wmOperator *op)
                BKE_reportf(op->reports, RPT_WARNING,
                            "Action '%s' does not specify what datablocks it can be used on "
                            "(try setting the 'ID Root Type' setting from the Datablocks Editor "
                BKE_reportf(op->reports, RPT_WARNING,
                            "Action '%s' does not specify what datablocks it can be used on "
                            "(try setting the 'ID Root Type' setting from the Datablocks Editor "
-                           "for this Action to avoid future problems)",
+                           "for this action to avoid future problems)",
                            act->id.name + 2);
        }
        
                            act->id.name + 2);
        }
        
index c1f7fc942e4f21ddf346e886694efa6f77ad2281..f108d9f1aaa081a1a5f7a673ac2c1f4ad4de446c 100644 (file)
@@ -57,4 +57,8 @@ if(WITH_AUDASPACE)
        add_definitions(-DWITH_AUDASPACE)
 endif()
 
        add_definitions(-DWITH_AUDASPACE)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}")
 blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}")
index ec06eacae9c777902c65b8bac11049c68a46d115..0b429ae750b673d3d5c8f042e4e5af0f0c1439bc 100644 (file)
@@ -8,7 +8,12 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna ../../blenloader ../../blenfont'
 incs += ' #/intern/audaspace/intern'
 
 incs += ' ../../makesrna ../../blenloader ../../blenfont'
 incs += ' #/intern/audaspace/intern'
 
+defs = []
+
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] )
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), defs, libtype=['core'], priority=[100] )
index ff895c06d5792b98d3326608a06eab6d94c8cb79..fd46f69da838fc9de84a22215801cd47877c9b1f 100644 (file)
@@ -325,7 +325,7 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op)
        clip = BLI_findlink(&CTX_data_main(C)->movieclip, RNA_enum_get(op->ptr, "clip"));
        
        if (clip == NULL) {
        clip = BLI_findlink(&CTX_data_main(C)->movieclip, RNA_enum_get(op->ptr, "clip"));
        
        if (clip == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "MovieClip not found");
+               BKE_report(op->reports, RPT_ERROR, "Movie clip not found");
                return OPERATOR_CANCELLED;
        }
        
                return OPERATOR_CANCELLED;
        }
        
@@ -553,7 +553,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad
        }
 
        if (seq_load.tot_success == 0) {
        }
 
        if (seq_load.tot_success == 0) {
-               BKE_reportf(op->reports, RPT_ERROR, "File \"%s\" could not be loaded", seq_load.path);
+               BKE_reportf(op->reports, RPT_ERROR, "File '%s' could not be loaded", seq_load.path);
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index 56fdccfb8f89a9099215fd6d4c78a1a1f5bd650c..7270516aa51af00789402692fc7f82d391f66ddb 100644 (file)
@@ -46,6 +46,8 @@
 #include "BLI_utildefines.h"
 #include "BLI_threads.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_threads.h"
 
+#include "BLF_translation.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
 
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
 
@@ -507,7 +509,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
        for (seq = ed->seqbasep->first; seq; seq = seq->next) {
                if (seq->flag & SELECT) {
                        if (seq->type == SEQ_TYPE_SOUND_RAM && BKE_sequence_effect_get_num_inputs(type) != 0) {
        for (seq = ed->seqbasep->first; seq; seq = seq->next) {
                if (seq->flag & SELECT) {
                        if (seq->type == SEQ_TYPE_SOUND_RAM && BKE_sequence_effect_get_num_inputs(type) != 0) {
-                               *error_str = "Can't apply effects to audio sequence strips";
+                               *error_str = N_("Cannot apply effects to audio sequence strips");
                                return 0;
                        }
                        if ((seq != activeseq) && (seq != seq2)) {
                                return 0;
                        }
                        if ((seq != activeseq) && (seq != seq2)) {
@@ -515,7 +517,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
                                else if (seq1 == NULL) seq1 = seq;
                                else if (seq3 == NULL) seq3 = seq;
                                else {
                                else if (seq1 == NULL) seq1 = seq;
                                else if (seq3 == NULL) seq3 = seq;
                                else {
-                                       *error_str = "Can't apply effect to more than 3 sequence strips";
+                                       *error_str = N_("Cannot apply effect to more than 3 sequence strips");
                                        return 0;
                                }
                        }
                                        return 0;
                                }
                        }
@@ -537,21 +539,21 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
                        return 1; /* succsess */
                case 1:
                        if (seq2 == NULL) {
                        return 1; /* succsess */
                case 1:
                        if (seq2 == NULL) {
-                               *error_str = "Need at least one selected sequence strip";
+                               *error_str = N_("At least one selected sequence strip is needed");
                                return 0;
                        }
                        if (seq1 == NULL) seq1 = seq2;
                        if (seq3 == NULL) seq3 = seq2;
                case 2:
                        if (seq1 == NULL || seq2 == NULL) {
                                return 0;
                        }
                        if (seq1 == NULL) seq1 = seq2;
                        if (seq3 == NULL) seq3 = seq2;
                case 2:
                        if (seq1 == NULL || seq2 == NULL) {
-                               *error_str = "Need 2 selected sequence strips";
+                               *error_str = N_("2 selected sequence strips are needed");
                                return 0;
                        }
                        if (seq3 == NULL) seq3 = seq2;
        }
        
        if (seq1 == NULL && seq2 == NULL && seq3 == NULL) {
                                return 0;
                        }
                        if (seq3 == NULL) seq3 = seq2;
        }
        
        if (seq1 == NULL && seq2 == NULL && seq3 == NULL) {
-               *error_str = "TODO: in what cases does this happen?";
+               *error_str = N_("TODO: in what cases does this happen?");
                return 0;
        }
        
                return 0;
        }
        
@@ -1384,7 +1386,7 @@ static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op)
            seq_is_predecessor(seq2, last_seq) ||
            seq_is_predecessor(seq3, last_seq))
        {
            seq_is_predecessor(seq2, last_seq) ||
            seq_is_predecessor(seq3, last_seq))
        {
-               BKE_report(op->reports, RPT_ERROR, "Can't reassign inputs: no cycles allowed");
+               BKE_report(op->reports, RPT_ERROR, "Cannot reassign inputs: no cycles allowed");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
@@ -2905,7 +2907,7 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op)
        }
 
        if (*seq_1 == NULL || *seq_2 == NULL) {
        }
 
        if (*seq_1 == NULL || *seq_2 == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "One of the effect inputs is unset, can't swap");
+               BKE_report(op->reports, RPT_ERROR, "One of the effect inputs is unset, cannot swap");
                return OPERATOR_CANCELLED;
        }
        else {
                return OPERATOR_CANCELLED;
        }
        else {
index 2c9b56d7a0d0a2064ae92ae21dddff85d2113139..c4df89547ef21f9ebf7a5f4d35b8309e09d9ff29 100644 (file)
@@ -1167,7 +1167,7 @@ static int sequencer_select_grouped_exec(bContext *C, wmOperator *op)
        extend = RNA_boolean_get(op->ptr, "extend");
 
        if (actseq == NULL) {
        extend = RNA_boolean_get(op->ptr, "extend");
 
        if (actseq == NULL) {
-               BKE_report(op->reports, RPT_ERROR, "No Active Sequence!");
+               BKE_report(op->reports, RPT_ERROR, "No active sequence!");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index ead7de92c5cb1095dba5ee9539025bf8fa28b9ca..9cc407f0604fd478ab8a8e41c61af0ddce41d25a 100644 (file)
@@ -54,4 +54,8 @@ if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
 
        add_definitions(-DWITH_PYTHON)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_text "${SRC}" "${INC}" "${INC_SYS}")
 blender_add_lib(bf_editor_text "${SRC}" "${INC}" "${INC_SYS}")
index 6ad6427f1d3523c25a8b9ff94d3a9aa7a4291545..373564520c8449ba517410ad8fa5ab301472c808 100644 (file)
@@ -10,4 +10,7 @@ incs += ' ../../python ../../makesrna ../../blenfont ../../blenloader'
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
 env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] )
 env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] )
index 6bb4c2987fb741827a2029c6010afa75f3f0ae02..2d902c4586a033193457031104a6e6500786b878 100644 (file)
@@ -44,6 +44,8 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "PIL_time.h"
 
 #include "BKE_context.h"
 #include "PIL_time.h"
 
 #include "BKE_context.h"
@@ -93,7 +95,7 @@ static int text_edit_poll(bContext *C)
                return 0;
 
        if (text->id.lib) {
                return 0;
 
        if (text->id.lib) {
-               // BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata");
+               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
                return 0;
        }
 
                return 0;
        }
 
@@ -109,7 +111,7 @@ static int text_space_edit_poll(bContext *C)
                return 0;
 
        if (text->id.lib) {
                return 0;
 
        if (text->id.lib) {
-               // BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata");
+               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
                return 0;
        }
 
                return 0;
        }
 
@@ -129,7 +131,7 @@ static int text_region_edit_poll(bContext *C)
                return 0;
 
        if (text->id.lib) {
                return 0;
 
        if (text->id.lib) {
-               // BKE_report(op->reports, RPT_ERROR, "Can't edit external libdata");
+               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
                return 0;
        }
 
                return 0;
        }
 
@@ -463,7 +465,8 @@ static void txt_write_file(Text *text, ReportList *reports)
        
        fp = BLI_fopen(filepath, "w");
        if (fp == NULL) {
        
        fp = BLI_fopen(filepath, "w");
        if (fp == NULL) {
-               BKE_reportf(reports, RPT_ERROR, "Unable to save \"%s\": %s", filepath, errno ? strerror(errno) : "Unknown error writing file");
+               BKE_reportf(reports, RPT_ERROR, "Unable to save '%s': %s",
+                           filepath, errno ? strerror(errno) : TIP_("unknown error writing file"));
                return;
        }
 
                return;
        }
 
@@ -482,7 +485,8 @@ static void txt_write_file(Text *text, ReportList *reports)
        }
        else {
                text->mtime = 0;
        }
        else {
                text->mtime = 0;
-               BKE_reportf(reports, RPT_WARNING, "Unable to stat \"%s\": %s", filepath, errno ? strerror(errno) : "Unknown error starrng file");
+               BKE_reportf(reports, RPT_WARNING, "Unable to stat '%s': %s",
+                           filepath, errno ? strerror(errno) : TIP_("unknown error stating file"));
        }
        
        if (text->flags & TXT_ISDIRTY)
        }
        
        if (text->flags & TXT_ISDIRTY)
index a626b71fdf8c31883d8290ae6cbc281c57374538..7c6645ce8acef67af47bec1fe7423bd10149103d 100644 (file)
@@ -1038,7 +1038,7 @@ static int view3d_localview_init(Main *bmain, Scene *scene, ScrArea *sa, ReportL
        locallay = free_localbit(bmain);
 
        if (locallay == 0) {
        locallay = free_localbit(bmain);
 
        if (locallay == 0) {
-               BKE_reportf(reports, RPT_ERROR, "No more than 8 local views");
+               BKE_report(reports, RPT_ERROR, "No more than 8 local views");
                ok = FALSE;
        }
        else {
                ok = FALSE;
        }
        else {
index 6659472f16b08dc959d14002eed066d7902f9d2e..f25b52416dc3e0d4630a5057f39a17d4f8919ede 100644 (file)
@@ -974,7 +974,7 @@ static void createTransPose(TransInfo *t, Object *ob)
        if (arm->flag & ARM_RESTPOS) {
                if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE) == 0) {
                        // XXX use transform operator reports
        if (arm->flag & ARM_RESTPOS) {
                if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE) == 0) {
                        // XXX use transform operator reports
-                       // BKE_report(op->reports, RPT_ERROR, "Can't select linked when sync selection is enabled");
+                       // BKE_report(op->reports, RPT_ERROR, "Cannot select linked when sync selection is enabled");
                        return;
                }
        }
                        return;
                }
        }
index fc0c174a5256d6a7ea3817914de3ab3967b9b090..916cf54058956eaaf99239e14343b81a223500ea 100644 (file)
@@ -284,7 +284,7 @@ static int create_orientation_exec(bContext *C, wmOperator *op)
        RNA_string_get(op->ptr, "name", name);
 
        if (use && !CTX_wm_view3d(C)) {
        RNA_string_get(op->ptr, "name", name);
 
        if (use && !CTX_wm_view3d(C)) {
-               BKE_report(op->reports, RPT_ERROR, "Create Orientation \"use\" parameter only valid in a 3dView context");
+               BKE_report(op->reports, RPT_ERROR, "Create Orientation's 'use' parameter only valid in a 3DView context");
                return OPERATOR_CANCELLED;
        }
 
                return OPERATOR_CANCELLED;
        }
 
index d285e0df313cc21ad3a012e2d135b1fe426e673c..55e7064390dedad41ccf3f03b1fd27f45c6e6034 100644 (file)
@@ -165,7 +165,7 @@ static bGPDstroke *rna_GPencil_stroke_new(bGPDframe *frame)
 static void rna_GPencil_stroke_remove(bGPDframe *frame, ReportList *reports, bGPDstroke *stroke)
 {
        if (BLI_findindex(&frame->strokes, stroke) == -1) {
 static void rna_GPencil_stroke_remove(bGPDframe *frame, ReportList *reports, bGPDstroke *stroke)
 {
        if (BLI_findindex(&frame->strokes, stroke) == -1) {
-               BKE_reportf(reports, RPT_ERROR, "Stroke not found in grease pencil frame");
+               BKE_report(reports, RPT_ERROR, "Stroke not found in grease pencil frame");
                return;
        }
        
                return;
        }
        
@@ -179,7 +179,7 @@ static bGPDframe *rna_GPencil_frame_new(bGPDlayer *layer, ReportList *reports, i
        bGPDframe *frame;
 
        if (BKE_gpencil_layer_find_frame(layer, frame_number)) {
        bGPDframe *frame;
 
        if (BKE_gpencil_layer_find_frame(layer, frame_number)) {
-               BKE_reportf(reports, RPT_ERROR, "Frame already exists on this frame number");
+               BKE_reportf(reports, RPT_ERROR, "Frame already exists on this frame number %d", frame_number);
                return NULL;
        }
 
                return NULL;
        }
 
@@ -193,7 +193,7 @@ static bGPDframe *rna_GPencil_frame_new(bGPDlayer *layer, ReportList *reports, i
 static void rna_GPencil_frame_remove(bGPDlayer *layer, ReportList *reports, bGPDframe *frame)
 {
        if (BLI_findindex(&layer->frames, frame) == -1) {
 static void rna_GPencil_frame_remove(bGPDlayer *layer, ReportList *reports, bGPDframe *frame)
 {
        if (BLI_findindex(&layer->frames, frame) == -1) {
-               BKE_reportf(reports, RPT_ERROR, "Frame not found in grease pencil layer");
+               BKE_report(reports, RPT_ERROR, "Frame not found in grease pencil layer");
                return;
        }
        
                return;
        }
        
@@ -229,7 +229,7 @@ static bGPDlayer *rna_GPencil_layer_new(bGPdata *gpd, const char *name, int seta
 static void rna_GPencil_layer_remove(bGPdata *gpd, ReportList *reports, bGPDlayer *layer)
 {
        if (BLI_findindex(&gpd->layers, layer) == -1) {
 static void rna_GPencil_layer_remove(bGPdata *gpd, ReportList *reports, bGPDlayer *layer)
 {
        if (BLI_findindex(&gpd->layers, layer) == -1) {
-               BKE_reportf(reports, RPT_ERROR, "Layer not found in grease pencil data");
+               BKE_report(reports, RPT_ERROR, "Layer not found in grease pencil data");
                return;
        }
        
                return;
        }
        
index 84cb9f131e4fce0e821e8766f3d8c4079d88f03a..cb5c515ce1fa90afffea86110f524987c9ed7efa 100644 (file)
@@ -143,7 +143,7 @@ static void rna_Image_pack(Image *image, ReportList *reports, int as_png)
        ImBuf *ibuf = BKE_image_get_ibuf(image, NULL);
 
        if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
        ImBuf *ibuf = BKE_image_get_ibuf(image, NULL);
 
        if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
-               BKE_reportf(reports, RPT_ERROR, "Cannot pack edited image from disk, only as internal PNG");
+               BKE_report(reports, RPT_ERROR, "Cannot pack edited image from disk, only as internal PNG");
        }
        else {
                if (as_png) {
        }
        else {
                if (as_png) {
index 0da2693046f16910a21f5d39602b2552129062a4..2b7fb61ea32e9d5e4b752d10f5eaec529ef7511e 100644 (file)
@@ -572,7 +572,7 @@ static void rna_Main_grease_pencil_remove(Main *bmain, ReportList *reports, bGPd
                BKE_libblock_free(&bmain->gpencil, gpd);
        }
        else
                BKE_libblock_free(&bmain->gpencil, gpd);
        }
        else
-               BKE_reportf(reports, RPT_ERROR, "Grease Pencil '%s' must have zero users to be removed, found %d",
+               BKE_reportf(reports, RPT_ERROR, "Grease pencil '%s' must have zero users to be removed, found %d",
                            gpd->id.name + 2, ID_REAL_USERS(gpd));
 
        /* XXX python now has invalid pointer? */
                            gpd->id.name + 2, ID_REAL_USERS(gpd));
 
        /* XXX python now has invalid pointer? */
index 97d9cc961efbf670d88b72dee115ab7637a09dc0..d7243dc519f1ac82c9a13eff9d9503df7adf7881 100644 (file)
@@ -318,7 +318,7 @@ static MaskLayer *rna_Mask_layers_new(Mask *mask, const char *name)
 static void rna_Mask_layers_remove(Mask *mask, ReportList *reports, MaskLayer *masklay)
 {
        if (BLI_findindex(&mask->masklayers, masklay) == -1) {
 static void rna_Mask_layers_remove(Mask *mask, ReportList *reports, MaskLayer *masklay)
 {
        if (BLI_findindex(&mask->masklayers, masklay) == -1) {
-               BKE_reportf(reports, RPT_ERROR, "MaskLayer '%s' not found in mask '%s'", masklay->name, mask->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Mask layer '%s' not found in mask '%s'", masklay->name, mask->id.name + 2);
                return;
        }
 
                return;
        }
 
index 3fc6cb126df49542f876dad70fc985271775aec1..8eca7162d396d70143d21c1ce2115ec43f9ae6c5 100644 (file)
@@ -1161,31 +1161,31 @@ static void rna_def_modifier_decimate(BlenderRNA *brna)
        RNA_def_property_float_sdna(prop, NULL, "angle");
        RNA_def_property_range(prop, 0, DEG2RAD(180));
        RNA_def_property_ui_range(prop, 0, DEG2RAD(180), 100, 2);
        RNA_def_property_float_sdna(prop, NULL, "angle");
        RNA_def_property_range(prop, 0, DEG2RAD(180));
        RNA_def_property_ui_range(prop, 0, DEG2RAD(180), 100, 2);
-       RNA_def_property_ui_text(prop, "Angle Limit", "Only dissolve angles below this(planar/dissolve only)");
+       RNA_def_property_ui_text(prop, "Angle Limit", "Only dissolve angles below this (planar only)");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        /* (mode == MOD_DECIM_MODE_COLLAPSE) */
        prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
        RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        /* (mode == MOD_DECIM_MODE_COLLAPSE) */
        prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
        RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
-       RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
+       RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name (collapse only)");
        RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DecimateModifier_vgroup_set");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_INVERT_VGROUP);
        RNA_def_property_string_funcs(prop, NULL, NULL, "rna_DecimateModifier_vgroup_set");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_INVERT_VGROUP);
-       RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence");
+       RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence (collapse only)");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "use_collapse_triangulate", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_TRIANGULATE);
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "use_collapse_triangulate", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_TRIANGULATE);
-       RNA_def_property_ui_text(prop, "Triangulate", "Keep triangulated faces resulting from decimation");
+       RNA_def_property_ui_text(prop, "Triangulate", "Keep triangulated faces resulting from decimation (collapse only)");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
        /* end collapse-only option */
 
        /* (mode == MOD_DECIM_MODE_DISSOLVE) */
        prop = RNA_def_property(srna, "use_dissolve_boundaries", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS);
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
        /* end collapse-only option */
 
        /* (mode == MOD_DECIM_MODE_DISSOLVE) */
        prop = RNA_def_property(srna, "use_dissolve_boundaries", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS);
-       RNA_def_property_ui_text(prop, "All Boundaries", "Dissolve all vertices inbetween face boundaries");
+       RNA_def_property_ui_text(prop, "All Boundaries", "Dissolve all vertices inbetween face boundaries (planar only)");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
        /* end dissolve-only option */
 
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
        /* end dissolve-only option */
 
index d92224ca83b420bab8cb7f9948b863c9f396df41..8704763a6f2fcb9a64551584319d513732a58148 100644 (file)
@@ -1038,7 +1038,7 @@ static void rna_RenderLayer_remove(ID *id, RenderData *UNUSED(rd), Main *bmain,
        Scene *scene = (Scene *)id;
 
        if (!BKE_scene_remove_render_layer(bmain, scene, srl)) {
        Scene *scene = (Scene *)id;
 
        if (!BKE_scene_remove_render_layer(bmain, scene, srl)) {
-               BKE_reportf(reports, RPT_ERROR, "RenderLayer '%s' could not be removed from scene '%s'",
+               BKE_reportf(reports, RPT_ERROR, "Render layer '%s' could not be removed from scene '%s'",
                            srl->name, scene->id.name + 2);
        }
        else {
                            srl->name, scene->id.name + 2);
        }
        else {
index 067589ca543500db56f89a534138f39e7edb7919..c5a0408c7a06160e108a5b7765ffa3f4c6ef59be 100644 (file)
@@ -341,7 +341,7 @@ static void rna_SequenceElements_pop(ID *id, Sequence *seq, ReportList *reports,
        StripElem *new_seq, *se;
 
        if (seq->len == 1) {
        StripElem *new_seq, *se;
 
        if (seq->len == 1) {
-               BKE_report(reports, RPT_ERROR, "SequenceElements.pop: can not pop the last element");
+               BKE_report(reports, RPT_ERROR, "SequenceElements.pop: cannot pop the last element");
                return;
        }
 
                return;
        }
 
index 30b6806a796ff800f435aeed23c4c409cd00aea1..b7994eeccdc481aa4168ffeaffe356714fa8abc6 100644 (file)
@@ -100,7 +100,7 @@ short BPy_errors_to_report(ReportList *reports)
        pystring = PyC_ExceptionBuffer();
        
        if (pystring == NULL) {
        pystring = PyC_ExceptionBuffer();
        
        if (pystring == NULL) {
-               BKE_report(reports, RPT_ERROR, "Unknown py-exception, couldn't convert");
+               BKE_report(reports, RPT_ERROR, "Unknown py-exception, could not convert");
                return 0;
        }
        
                return 0;
        }
        
@@ -111,15 +111,15 @@ short BPy_errors_to_report(ReportList *reports)
        cstring = _PyUnicode_AsString(pystring);
 
 #if 0 /* ARG!. workaround for a bug in blenders use of vsnprintf */
        cstring = _PyUnicode_AsString(pystring);
 
 #if 0 /* ARG!. workaround for a bug in blenders use of vsnprintf */
-       BKE_reportf(reports, RPT_ERROR, "%s\nlocation:%s:%d\n", cstring, filename, lineno);
+       BKE_reportf(reports, RPT_ERROR, "%s\nlocation: %s:%d\n", cstring, filename, lineno);
 #else
 #else
-       pystring_format = PyUnicode_FromFormat(TIP_("%s\nlocation:%s:%d\n"), cstring, filename, lineno);
+       pystring_format = PyUnicode_FromFormat(TIP_("%s\nlocation: %s:%d\n"), cstring, filename, lineno);
        cstring = _PyUnicode_AsString(pystring_format);
        BKE_report(reports, RPT_ERROR, cstring);
 #endif
 
        /* not exactly needed. just for testing */
        cstring = _PyUnicode_AsString(pystring_format);
        BKE_report(reports, RPT_ERROR, cstring);
 #endif
 
        /* not exactly needed. just for testing */
-       fprintf(stderr, TIP_("%s\nlocation:%s:%d\n"), cstring, filename, lineno);
+       fprintf(stderr, TIP_("%s\nlocation: %s:%d\n"), cstring, filename, lineno);
 
        Py_DECREF(pystring);
        Py_DECREF(pystring_format);  /* workaround */
 
        Py_DECREF(pystring);
        Py_DECREF(pystring_format);  /* workaround */