[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55169] trunk/blender: More UI message i18n fixes and improvements...
Bastien Montagne
montagne29 at wanadoo.fr
Sun Mar 10 17:55:02 CET 2013
Revision: 55169
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55169
Author: mont29
Date: 2013-03-10 16:55:01 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
More UI message i18n fixes and improvements...
Rendering messages are now translatable.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/render/SConscript
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2013-03-10 16:55:01 UTC (rev 55169)
@@ -77,6 +77,7 @@
"builtin", "builtins",
"bytecode",
"chunksize",
+ "dataset", "datasets",
"de",
"defocus",
"denoise",
@@ -96,6 +97,7 @@
"inscatter", "inscattering",
"libdata",
"lightless",
+ "localview",
"lookup", "lookups",
"mathutils",
"midlevel",
@@ -113,6 +115,7 @@
"polyline",
"popup", "popups",
"pre",
+ "precache", "precaching",
"precalculate",
"prefetch",
"premultiply", "premultiplied",
@@ -120,6 +123,7 @@
"prepend",
"preprocess", "preprocessing",
"preseek",
+ "raytree",
"readonly",
"realtime",
"rekey",
@@ -132,6 +136,7 @@
"rolloff",
"screencast", "screenshot", "screenshots",
"selfcollision",
+ "shadowbuffer", "shadowbuffers",
"singletexture",
"spellcheck", "spellchecking",
"startup",
@@ -243,6 +248,7 @@
"quat", "quats",
"recalc", "recalcs",
"refl",
+ "sce",
"sel",
"spec",
"struct", "structs",
@@ -250,6 +256,7 @@
"tex",
"tri", "tris",
"uv", "uvs", "uvw", "uw", "uvmap",
+ "ve",
"vec",
"vel", # velocity!
"vert", "verts",
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2013-03-10 16:55:01 UTC (rev 55169)
@@ -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 @@
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);
Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/render/CMakeLists.txt 2013-03-10 16:55:01 UTC (rev 55169)
@@ -158,6 +158,10 @@
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")
Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/render/SConscript 2013-03-10 16:55:01 UTC (rev 55169)
@@ -86,6 +86,9 @@
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']
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2013-03-10 16:55:01 UTC (rev 55169)
@@ -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 @@
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 @@
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 @@
else
re->i.convertdone = TRUE;
- re->i.infostr= NULL;
+ re->i.infostr = NULL;
re->stats_draw(re->sdh, &re->i);
}
@@ -5591,7 +5593,7 @@
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 @@
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 @@
}
}
- re->i.infostr= NULL;
+ re->i.infostr = NULL;
re->stats_draw(re->sdh, &re->i);
}
Modified: trunk/blender/source/blender/render/intern/source/envmap.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/envmap.c 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/render/intern/source/envmap.c 2013-03-10 16:55:01 UTC (rev 55169)
@@ -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 @@
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 */
Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c 2013-03-10 16:55:01 UTC (rev 55169)
@@ -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 @@
/* 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);
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c 2013-03-10 16:15:25 UTC (rev 55168)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c 2013-03-10 16:55:01 UTC (rev 55169)
@@ -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 @@
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)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list