forked from bartvdbraak/blender
More UI message i18n fixes and improvements...
Rendering messages are now translatable.
This commit is contained in:
parent
7a94ad9408
commit
874b692e80
@ -77,6 +77,7 @@ class SpellChecker():
|
||||
"builtin", "builtins",
|
||||
"bytecode",
|
||||
"chunksize",
|
||||
"dataset", "datasets",
|
||||
"de",
|
||||
"defocus",
|
||||
"denoise",
|
||||
@ -96,6 +97,7 @@ class SpellChecker():
|
||||
"inscatter", "inscattering",
|
||||
"libdata",
|
||||
"lightless",
|
||||
"localview",
|
||||
"lookup", "lookups",
|
||||
"mathutils",
|
||||
"midlevel",
|
||||
@ -113,6 +115,7 @@ class SpellChecker():
|
||||
"polyline",
|
||||
"popup", "popups",
|
||||
"pre",
|
||||
"precache", "precaching",
|
||||
"precalculate",
|
||||
"prefetch",
|
||||
"premultiply", "premultiplied",
|
||||
@ -120,6 +123,7 @@ class SpellChecker():
|
||||
"prepend",
|
||||
"preprocess", "preprocessing",
|
||||
"preseek",
|
||||
"raytree",
|
||||
"readonly",
|
||||
"realtime",
|
||||
"rekey",
|
||||
@ -132,6 +136,7 @@ class SpellChecker():
|
||||
"rolloff",
|
||||
"screencast", "screenshot", "screenshots",
|
||||
"selfcollision",
|
||||
"shadowbuffer", "shadowbuffers",
|
||||
"singletexture",
|
||||
"spellcheck", "spellchecking",
|
||||
"startup",
|
||||
@ -243,6 +248,7 @@ class SpellChecker():
|
||||
"quat", "quats",
|
||||
"recalc", "recalcs",
|
||||
"refl",
|
||||
"sce",
|
||||
"sel",
|
||||
"spec",
|
||||
"struct", "structs",
|
||||
@ -250,6 +256,7 @@ class SpellChecker():
|
||||
"tex",
|
||||
"tri", "tris",
|
||||
"uv", "uvs", "uvw", "uw", "uvmap",
|
||||
"ve",
|
||||
"vec",
|
||||
"vel", # velocity!
|
||||
"vert", "verts",
|
||||
|
@ -39,6 +39,8 @@
|
||||
#include "BLI_rand.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
#include "BKE_blender.h"
|
||||
@ -281,38 +283,39 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
|
||||
megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
|
||||
|
||||
if (scene->lay & 0xFF000000)
|
||||
spos += sprintf(spos, "Localview | ");
|
||||
spos += sprintf(spos, IFACE_("Localview | "));
|
||||
else if (scene->r.scemode & R_SINGLE_LAYER)
|
||||
spos += sprintf(spos, "Single Layer | ");
|
||||
spos += sprintf(spos, IFACE_("Single Layer | "));
|
||||
|
||||
spos += sprintf(spos, "Frame:%d ", (scene->r.cfra));
|
||||
spos += sprintf(spos, IFACE_("Frame:%d "), (scene->r.cfra));
|
||||
|
||||
if (rs->statstr) {
|
||||
spos += sprintf(spos, "| %s ", rs->statstr);
|
||||
}
|
||||
else {
|
||||
if (rs->totvert) spos += sprintf(spos, "Ve:%d ", rs->totvert);
|
||||
if (rs->totface) spos += sprintf(spos, "Fa:%d ", rs->totface);
|
||||
if (rs->tothalo) spos += sprintf(spos, "Ha:%d ", rs->tothalo);
|
||||
if (rs->totstrand) spos += sprintf(spos, "St:%d ", rs->totstrand);
|
||||
if (rs->totlamp) spos += sprintf(spos, "La:%d ", rs->totlamp);
|
||||
if (rs->totvert) spos += sprintf(spos, IFACE_("Ve:%d "), rs->totvert);
|
||||
if (rs->totface) spos += sprintf(spos, IFACE_("Fa:%d "), rs->totface);
|
||||
if (rs->tothalo) spos += sprintf(spos, IFACE_("Ha:%d "), rs->tothalo);
|
||||
if (rs->totstrand) spos += sprintf(spos, IFACE_("St:%d "), rs->totstrand);
|
||||
if (rs->totlamp) spos += sprintf(spos, IFACE_("La:%d "), rs->totlamp);
|
||||
|
||||
if (rs->mem_peak == 0.0f)
|
||||
spos += sprintf(spos, "Mem:%.2fM (%.2fM, peak %.2fM) ", megs_used_memory, mmap_used_memory, megs_peak_memory);
|
||||
spos += sprintf(spos, IFACE_("Mem:%.2fM (%.2fM, Peak %.2fM) "),
|
||||
megs_used_memory, mmap_used_memory, megs_peak_memory);
|
||||
else
|
||||
spos += sprintf(spos, "Mem:%.2fM, Peak: %.2fM ", rs->mem_used, rs->mem_peak);
|
||||
spos += sprintf(spos, IFACE_("Mem:%.2fM, Peak: %.2fM "), rs->mem_used, rs->mem_peak);
|
||||
|
||||
if (rs->curfield)
|
||||
spos += sprintf(spos, "Field %d ", rs->curfield);
|
||||
spos += sprintf(spos, IFACE_("Field %d "), rs->curfield);
|
||||
if (rs->curblur)
|
||||
spos += sprintf(spos, "Blur %d ", rs->curblur);
|
||||
spos += sprintf(spos, IFACE_("Blur %d "), rs->curblur);
|
||||
}
|
||||
|
||||
BLI_timestr(rs->lastframetime, info_time_str);
|
||||
spos += sprintf(spos, "Time:%s ", info_time_str);
|
||||
spos += sprintf(spos, IFACE_("Time:%s "), info_time_str);
|
||||
|
||||
if (rs->curfsa)
|
||||
spos += sprintf(spos, "| Full Sample %d ", rs->curfsa);
|
||||
spos += sprintf(spos, IFACE_("| Full Sample %d "), rs->curfsa);
|
||||
|
||||
if (rs->infostr && rs->infostr[0])
|
||||
spos += sprintf(spos, "| %s ", rs->infostr);
|
||||
|
@ -158,6 +158,10 @@ if(WITH_GAMEENGINE)
|
||||
add_definitions(-DWITH_GAMEENGINE)
|
||||
endif()
|
||||
|
||||
if(WITH_INTERNATIONAL)
|
||||
add_definitions(-DWITH_INTERNATIONAL)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
# SSE math is enabled by default on x86_64
|
||||
if(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
|
||||
|
@ -86,6 +86,9 @@ if env['WITH_BF_OPENEXR']:
|
||||
if env['WITH_BF_GAMEENGINE']:
|
||||
defs.append('WITH_GAMEENGINE')
|
||||
|
||||
if env['WITH_BF_INTERNATIONAL']:
|
||||
defs.append('WITH_INTERNATIONAL')
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
|
||||
incs += ' ' + env['BF_PTHREADS_INC']
|
||||
|
||||
|
@ -43,6 +43,8 @@
|
||||
#include "BLI_ghash.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "DNA_armature_types.h"
|
||||
#include "DNA_camera_types.h"
|
||||
#include "DNA_material_types.h"
|
||||
@ -5119,7 +5121,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
|
||||
tothalo= re->tothalo;
|
||||
if (!re->test_break(re->tbh)) {
|
||||
if (re->wrld.mode & WO_STARS) {
|
||||
re->i.infostr= "Creating Starfield";
|
||||
re->i.infostr = IFACE_("Creating Starfield");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
RE_make_stars(re, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
@ -5128,7 +5130,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
|
||||
|
||||
init_camera_inside_volumes(re);
|
||||
|
||||
re->i.infostr= "Creating Shadowbuffers";
|
||||
re->i.infostr = IFACE_("Creating Shadowbuffers");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
/* SHADOW BUFFER */
|
||||
@ -5178,7 +5180,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
|
||||
else
|
||||
re->i.convertdone = TRUE;
|
||||
|
||||
re->i.infostr= NULL;
|
||||
re->i.infostr = NULL;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
}
|
||||
|
||||
@ -5591,7 +5593,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
|
||||
ListBase strandsurface;
|
||||
int step;
|
||||
|
||||
re->i.infostr= "Calculating previous frame vectors";
|
||||
re->i.infostr = IFACE_("Calculating previous frame vectors");
|
||||
re->r.mode |= R_SPEED;
|
||||
|
||||
speedvector_project(re, NULL, NULL, NULL); /* initializes projection code */
|
||||
@ -5610,7 +5612,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
|
||||
|
||||
if (!re->test_break(re->tbh)) {
|
||||
/* creates entire dbase */
|
||||
re->i.infostr= "Calculating next frame vectors";
|
||||
re->i.infostr = IFACE_("Calculating next frame vectors");
|
||||
|
||||
database_fromscene_vectors(re, sce, lay, +1);
|
||||
}
|
||||
@ -5696,7 +5698,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
|
||||
}
|
||||
}
|
||||
|
||||
re->i.infostr= NULL;
|
||||
re->i.infostr = NULL;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
}
|
||||
|
||||
|
@ -38,6 +38,8 @@
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "IMB_imbuf_types.h"
|
||||
#include "IMB_imbuf.h" /* for rectcpy */
|
||||
|
||||
@ -512,7 +514,7 @@ void make_envmaps(Render *re)
|
||||
trace = (re->r.mode & R_RAYTRACE);
|
||||
re->r.mode &= ~R_RAYTRACE;
|
||||
|
||||
re->i.infostr = "Creating Environment maps";
|
||||
re->i.infostr = IFACE_("Creating Environment maps");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
/* 5 = hardcoded max recursion level */
|
||||
|
@ -44,6 +44,8 @@
|
||||
#include "BLI_threads.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_scene.h"
|
||||
|
||||
@ -1257,7 +1259,7 @@ void make_occ_tree(Render *re)
|
||||
/* ugly, needed for occ_face */
|
||||
R = *re;
|
||||
|
||||
re->i.infostr = "Occlusion preprocessing";
|
||||
re->i.infostr = IFACE_("Occlusion preprocessing");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
re->occlusiontree = tree = occ_tree_build(re);
|
||||
|
@ -55,6 +55,8 @@
|
||||
#include "BLI_rand.h"
|
||||
#include "BLI_callbacks.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */
|
||||
#include "BKE_camera.h"
|
||||
#include "BKE_global.h"
|
||||
@ -155,22 +157,23 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
|
||||
mmap_used_memory = (mmap_in_use) / (1024.0 * 1024.0);
|
||||
megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
|
||||
|
||||
fprintf(stdout, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra,
|
||||
fprintf(stdout, IFACE_("Fra:%d Mem:%.2fM (%.2fM, Peak %.2fM) "), rs->cfra,
|
||||
megs_used_memory, mmap_used_memory, megs_peak_memory);
|
||||
|
||||
if (rs->curfield)
|
||||
fprintf(stdout, "Field %d ", rs->curfield);
|
||||
fprintf(stdout, IFACE_("Field %d "), rs->curfield);
|
||||
if (rs->curblur)
|
||||
fprintf(stdout, "Blur %d ", rs->curblur);
|
||||
fprintf(stdout, IFACE_("Blur %d "), rs->curblur);
|
||||
|
||||
if (rs->infostr) {
|
||||
fprintf(stdout, "| %s", rs->infostr);
|
||||
}
|
||||
else {
|
||||
if (rs->tothalo)
|
||||
fprintf(stdout, "Sce: %s Ve:%d Fa:%d Ha:%d La:%d", rs->scene_name, rs->totvert, rs->totface, rs->tothalo, rs->totlamp);
|
||||
fprintf(stdout, IFACE_("Sce: %s Ve:%d Fa:%d Ha:%d La:%d"),
|
||||
rs->scene_name, rs->totvert, rs->totface, rs->tothalo, rs->totlamp);
|
||||
else
|
||||
fprintf(stdout, "Sce: %s Ve:%d Fa:%d La:%d", rs->scene_name, rs->totvert, rs->totface, rs->totlamp);
|
||||
fprintf(stdout, IFACE_("Sce: %s Ve:%d Fa:%d La:%d"), rs->scene_name, rs->totvert, rs->totface, rs->totlamp);
|
||||
}
|
||||
|
||||
BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
|
||||
@ -821,7 +824,7 @@ static void print_part_stats(Render *re, RenderPart *pa)
|
||||
{
|
||||
char str[64];
|
||||
|
||||
BLI_snprintf(str, sizeof(str), "%s, Part %d-%d", re->scene->id.name + 2, pa->nr, re->i.totpart);
|
||||
BLI_snprintf(str, sizeof(str), IFACE_("%s, Part %d-%d"), re->scene->id.name + 2, pa->nr, re->i.totpart);
|
||||
re->i.infostr = str;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
re->i.infostr = NULL;
|
||||
|
@ -40,6 +40,8 @@
|
||||
#include "BLI_kdopbvh.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "BKE_DerivedMesh.h"
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_lattice.h"
|
||||
@ -299,7 +301,7 @@ void make_pointdensities(Render *re)
|
||||
if (re->scene->r.scemode & R_PREVIEWBUTS)
|
||||
return;
|
||||
|
||||
re->i.infostr= "Caching Point Densities";
|
||||
re->i.infostr = IFACE_("Caching Point Densities");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
for (tex= re->main->tex.first; tex; tex= tex->id.next) {
|
||||
@ -308,7 +310,7 @@ void make_pointdensities(Render *re)
|
||||
}
|
||||
}
|
||||
|
||||
re->i.infostr= NULL;
|
||||
re->i.infostr = NULL;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
}
|
||||
|
||||
|
@ -47,6 +47,8 @@
|
||||
#include "BLI_rand.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_node.h"
|
||||
|
||||
@ -400,7 +402,7 @@ static void makeraytree_single(Render *re)
|
||||
}
|
||||
|
||||
if (!test_break(re)) {
|
||||
re->i.infostr= "Raytree.. building";
|
||||
re->i.infostr = IFACE_("Raytree.. building");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
RE_rayobject_done(raytree);
|
||||
@ -412,7 +414,7 @@ void makeraytree(Render *re)
|
||||
float min[3], max[3], sub[3];
|
||||
int i;
|
||||
|
||||
re->i.infostr= "Raytree.. preparing";
|
||||
re->i.infostr = IFACE_("Raytree.. preparing");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
/* disable options not yet supported by octree,
|
||||
@ -425,7 +427,7 @@ void makeraytree(Render *re)
|
||||
if (test_break(re)) {
|
||||
freeraytree(re);
|
||||
|
||||
re->i.infostr= "Raytree building canceled";
|
||||
re->i.infostr = IFACE_("Raytree building canceled");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
}
|
||||
else {
|
||||
@ -446,7 +448,7 @@ void makeraytree(Render *re)
|
||||
|
||||
re->maxdist = len_v3(sub);
|
||||
|
||||
re->i.infostr= "Raytree finished";
|
||||
re->i.infostr = IFACE_("Raytree finished");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
}
|
||||
|
||||
|
@ -55,6 +55,8 @@
|
||||
#include "BLI_ghash.h"
|
||||
#include "BLI_memarena.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "PIL_time.h"
|
||||
|
||||
#include "DNA_material_types.h"
|
||||
@ -994,7 +996,7 @@ void make_sss_tree(Render *re)
|
||||
|
||||
re->sss_hash= BLI_ghash_ptr_new("make_sss_tree gh");
|
||||
|
||||
re->i.infostr= "SSS preprocessing";
|
||||
re->i.infostr = IFACE_("SSS preprocessing");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
for (mat= re->main->mat.first; mat; mat= mat->id.next)
|
||||
|
@ -43,6 +43,8 @@
|
||||
#include "BLI_voxel.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "PIL_time.h"
|
||||
|
||||
#include "RE_shader_ext.h"
|
||||
@ -400,10 +402,11 @@ static void multiple_scattering_diffusion(Render *re, VolumePrecache *vp, Materi
|
||||
/* Displays progress every second */
|
||||
if (time-lasttime>1.0) {
|
||||
char str[64];
|
||||
BLI_snprintf(str, sizeof(str), "Simulating multiple scattering: %d%%", (int)(100.0f * (c / total)));
|
||||
re->i.infostr= str;
|
||||
BLI_snprintf(str, sizeof(str), IFACE_("Simulating multiple scattering: %d%%"),
|
||||
(int)(100.0f * (c / total)));
|
||||
re->i.infostr = str;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
re->i.infostr= NULL;
|
||||
re->i.infostr = NULL;
|
||||
lasttime= time;
|
||||
}
|
||||
}
|
||||
@ -742,11 +745,12 @@ static void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *o
|
||||
time= PIL_check_seconds_timer();
|
||||
if (time-lasttime>1.0) {
|
||||
char str[64];
|
||||
BLI_snprintf(str, sizeof(str), "Precaching volume: %d%%", (int)(100.0f * ((float)counter / (float)totparts)));
|
||||
re->i.infostr= str;
|
||||
BLI_snprintf(str, sizeof(str), IFACE_("Precaching volume: %d%%"),
|
||||
(int)(100.0f * ((float)counter / (float)totparts)));
|
||||
re->i.infostr = str;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
re->i.infostr= NULL;
|
||||
lasttime= time;
|
||||
re->i.infostr = NULL;
|
||||
lasttime = time;
|
||||
}
|
||||
}
|
||||
|
||||
@ -784,7 +788,7 @@ void volume_precache(Render *re)
|
||||
ObjectInstanceRen *obi;
|
||||
VolumeOb *vo;
|
||||
|
||||
re->i.infostr= "Volume preprocessing";
|
||||
re->i.infostr = IFACE_("Volume preprocessing");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
for (vo= re->volumes.first; vo; vo= vo->next) {
|
||||
@ -803,7 +807,7 @@ void volume_precache(Render *re)
|
||||
}
|
||||
}
|
||||
|
||||
re->i.infostr= NULL;
|
||||
re->i.infostr = NULL;
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
}
|
||||
|
||||
|
@ -41,6 +41,8 @@
|
||||
#include "BLI_voxel.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "IMB_imbuf.h"
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
@ -400,7 +402,7 @@ void make_voxeldata(struct Render *re)
|
||||
{
|
||||
Tex *tex;
|
||||
|
||||
re->i.infostr = "Loading voxel datasets";
|
||||
re->i.infostr = IFACE_("Loading voxel datasets");
|
||||
re->stats_draw(re->sdh, &re->i);
|
||||
|
||||
/* XXX: should be doing only textures used in this render */
|
||||
|
Loading…
Reference in New Issue
Block a user