diff --git a/po/POTFILES.in b/po/POTFILES.in old mode 100755 new mode 100644 diff --git a/po/messages.txt b/po/messages.txt new file mode 100644 index 00000000000..56a22454774 --- /dev/null +++ b/po/messages.txt @@ -0,0 +1,5337 @@ +The edited object +Texture datablocks. +Bezier curve point with two handles defining a Keyframe on an F-Curve +Media Stop +System & OpenGL +Strips Selected +Active Keying Set +Action Blending +Bone is able to be selected +Display files as short list +Build 75% proxy resolution +Right Mouse +Restrict the number of animation updates to the animation FPS. This is better for performance, but can cause issues with smooth playback. +Particle system can be edited in particle mode +UV editor data for the image editor space +Editing hair +Zoom using opposite direction +Graph Editor space data +Tiles +Align newly added objects to the world coordinates +Index of custom color set +Sample point for F-Curve +AVI Raw +Linear Drag +Color to display the marker with +Channels Region +Lower bound of envelope at this control-point +Fluid +Regions this area is subdivided in +Double Click +Disable simulation of linear motion along the X axis +Sequencer OpenGL +Child particles generated by the particle system +Point in a shape key for curves +Lock to Bone +Sun Size +Set modifier expanded in the user interface +Multiple Scattering +ID Name +Square (SV + H) +Animation Visualisation +Keyed States +Fixed size vertex indices array +Normal Size +Track To +Collection of keymaps +Channel Group +Number of vertical pixels in the screen +Fluid Simulation +Zooms in and out like scaling the view, mouse movements relative to center +Lattice Edit +Snap onto its self (editmode) +Only render what's in front of the solid z values +True when multiple enums +Backdrop Zoom +Causes mesh data to be duplicated with the object +Automatic +Small Caps +UV Project +UV Sync Selection +Cloth dynamics for hair +Sensitivity +Amount of rotation around side vector +Specify how many frames the Map Old will last +Start Still +All Object Origins +Unique datablock ID name +Active pose marker for this Action +Draw Channels +Control how much mist density decreases with height +Tool Settings +Text Line +Bone Constraints +Toggle whether the material is linked to object data or the object block +Falloff power for transmissivity filter effect (1.0 is linear) +Only use case sensitive matches of search string +Screw +Region Text +Representation of alpha information in the RGBA pixels +Smoothens emitted smoke to avoid blockiness. +Edges receive a drag force from surrounding media +Sequence Transform +Over Drop +Domain Settings +New F-Curve Colors - XYZ to RGB +Space that owner is evaluated in +Frame Step +Enumeration +Value of the item +Parent of this pose bone +B-Bone Z size +Up Arrow +For reactor systems, the object that has the target particle system (empty if same object) +Shift key pressed +Auto Refresh +Bone Color Sets +Positive values make strands rounder, negative makes strands spiky +Collection of images +Show actuators of active object +interpolate a global timestamp using the record date and time written by recording device +Main Lattices +Variable from some source/target for driver relationship +Z Location +Auto-Clamped handle selected color +Fixed Alternate +Game engine sensor to detect events +Include the frame number in image metadata +Bone does not deform any geometry +UV Textures +Game +Minimal Spring length * Ball Size +16384 +Line in which the marker is located +Edge Threshold +-Z +Set audio channels to mono +Jump Speed +HuffYUV +Active Bone +Sets the audio channel count +Rotation Damping +Max Air Acceleration +Snap center onto target +Spring Damping +Compact with Milliseconds +Maintain speed, flight level or wander +Interpolation type +Type Info +SIMD QBVH +active +Armature +Match case +16 Bit +XZY Rotation Order. Prone to Gimbal Lock +Auto handle selected color +Theme File Browser +Bake the normals in object space +Enable color range used for weight visualization in weight painting mode +Vorticity +Open window +Shows sensors for this object in the user interface +Radius of head of bone (for Envelope deform only) +Plain diffuse energy (white.) +Elasticity +Cache Step +View Sliders +Hair +Filter Movies +Material datablock used by this material slot +Smooth Emitter +Catalan (Català) +Proxy parameters for a sequence strip +Home +Action Mouse +Show Debug Info +Loads a saved environment map image from disk +is_baking +Falloff power (real gravitational falloff = 2) +Wire +Group +On Land +Maximum distance of reflected rays. Reflections further than this range fade to sky color or material color +Group Objects +Time Step +Keep UI +Bone inherits rotation or scale from parent bone +Show Selected Object +Time of key over the simulation +Header Text +Health +Similar to SMPTE (Compact), except that instead of frames, milliseconds are shown instead +Blender Original +Deliver texture UV pass +Index number of the vertex +Stepped Interpolation +Adds diagonal springs on 4-gons +Shear +Tent +Strength of force field +Space that target is evaluated in +F11 +Star +Line Input +Lighten +In Range +Use Blender units for widths instead of pixels +F17 +Node Socket +Quad-Buffer +Sets scaling for the texture's X, Y and Z sizes +Motion Path settings for animation visualisation +Make hairs longer +Set audio sample format to 32 bit float +Amount of anti-aliasing samples per pixel +type +Use optimized Bullet DBVT tree for view frustum and occlusion culling +Make this surface a closed loop in the V direction +Alpha Over +Media player for video & png/jpeg/sgi image sequences +Second input for the effect strip +Space Logic Editor +Snap during transform +Edit Methods +Left Handle +B-Bone Ease Out +Cyclic Offset +Subtype +Object Base +Vertex Group Clump +Letterbox +Set audio channels to 7.1 surround sound +V +Quaternion (WXYZ) +Image File +Preset configs for external animation players +Maximum Value +Make this nurbs curve or surface act like a Bezier spline in the U direction (Order U must be 3 or 4, Cyclic U must be disabled) +Factor Repulsion +uk_UA +3x3 bone matrix +Vertex Weight +Display Material +Show UV editing related properties +GLSL Shaders +Text +Deliver shadow pass +From node +Keyframes +Main Brushes +Deliver diffuse pass +Header +Level detector, trigger controllers of new states(only applicable upon logic state transition) +Collision Compound +Increment +Trackball +Active Strip +Initial Rest Length +User defined layer of string text values +Edge Tag Mode +Active camera used in this view (when unlocked from the scene's active camera) +Deliver emission pass +Face Selected +Xor +Voronoi Crackle +Align the transformation axes to the window +Line sample +Default Goal (vertex target position) value, when no Vertex Group used +Type of raytrace accelerator structure +Area Spaces +Project individual elements on the surface of other objects +Use the angle between two bones +Aero +Zmask +Set audio sample format to 32 bit signed integer +Scene render size +Multiplier to convert blender units to physical distance +Free Image Textures +High quality interpolation, but slower +DPI +Fill in Z values for solid faces in invisible layers, for masking +Active Action for this datablock +Use turntable style rotation in the viewport +Format +Use a Catmull-Rom filter for anti-aliasing +Link material to object or the object's data +Type of participation in the fluid simulation +face normal +Enable +Final 4x4 matrix after constraints and drivers are applied (object space) +Diameter of widget, in 10 pixel units +ID Property +Radius of tail of bone (for Envelope deform only) +Custom Shape Transform +Action FCurves +Envelope Deform Weight +A +Renders star shaped lines over halo +Fade-out Color +Syntax Built-in +Panel Style +Material datablocks. +Bounding Box Center +Middle Mouse +Framerate base +Touch +Vortex +Manipulator Size +F-Curve Colors - XYZ to RGB +Invert Output +Calculate heights against unsubdivided low resolution mesh +Shrinkwrap +Window Deactivate +Y position of the sequence strip +The frame on which this sketch appears +Snap to increments of grid +Rest Length +All +Serbian (Српском језику) +Sample Method +Text Anti-aliasing +Luma Waveform +Sequencer Preview Shading +Lower field first +File Name +Show timing in seconds not frames +Display the object as wire edges +Billboard with Z-axis constraint +Curves +Displays clock frequency of fullscreen display +X Rotation +Sphere +Select UVs that share mesh vertex, irrespective if they are in the same location +8 bit RAW +0.5 means no distance at all, 1.0 is maximum distance +Sequencer +Max Ghost Range +An object instance in a scene +User Interface +Alt +Vertex group name +Number of cone samples averaged for blurry refractions +Animated Selected +Blue +Damping of the spring force, when inside the physics distance area +Plugin Strip +Hide +Pose Matrix +Guide-free time from particle life's end +Frame is being edited (painted on) +Large Cursors +Limit Rotation +Draw only faces with the currently displayed image assigned +Record Run +Pixel width over which the reconstruction filter combines samples +Global Scene +Source List Text Highlight +User-editable keyframes +Scaling factor for action +Inner +Active Constraint +Side-by-side +Right Arrow +Causes the 1 to 0 keys to act as the numpad (useful for laptops) +A collection of pose channels, including settings for animating bones +Lennard-Jones +Use a maximum radial distance for the field to work +Location of tail end of the bone relative to armature +Edit All +estimate matrix .. split to COM , ROT ,SCALE +Use Coordinates +Theme User Preferences +Show line numbers next to the text +Minimum speed in air (relative to maximum speed) +Display keymap datablocks +, +Display Summary +Channel Driver (only set for Driver F-Curves) +Item +In/Out Node +Frame that modifier's influence ends (if Restrict Frame Range is in use) +Premultiplied +Samples below this threshold will be considered fully shadowed/unshadowed and skipped (for Raytrace Adaptive QMC) +Number of frames cached +Description of the Struct's purpose +Tilt in 3D View +Show Debug +Offsets image horizontally from the world origin +region_data +Protect layer from further editing and/or frame changes +File Format +Use this files path when library linked into another file. +Upper bound of envelope at this control-point +Interaction Radius +Syntax String +Vertex group to control density +Show Overexposed +Vertices +Kerning Style +IK X Minimum +Sets the factor by which the flare is larger than the halo +Absolute ball size or factor if not manual adjusted +Blend Opacity +Steps +Texture +Settings for the visualisation of motion +Group of vertices, used for armature deform and other purposes +Limit Distance +Minus +No interpolation, fast but blocky and low quality +Control +Full SMPTE timecode. Format is HH:MM:SS:FF +Open On Mouse Over +Show sensors of active object +Frame Server Port +Noise patterns will remain unchanged, faster and suitable for stills +Start +RLE (lossless) +True when the property is not saved in presets +Images are rendered in new Window +Theme Timeline +If this is set, the header gets a custom ID, otherwise it takes the name of the class used to define the panel. For example, if the class name is "OBJECT_HT_hello", and bl_idname is not set by the script, then bl_idname = "OBJECT_HT_hello" +Stamp Text Color +Show Cursor +Goal Default +Shape Key Point +Object Origin Size +Orthographic +Black +Unit Scale +Collection of points for Bezier curves only +Mouse +Pivot Point +UV Layer to control billboard splitting +Only insert keyframes where they're needed in the relevant F-Curves +IK Z Minimum +Distance +Key rotation quaternion +Backscattered light +Texture effector weight +Volume rendering settings for a Material datablock +Which output node to use, for node-based textures +Handle 1 selection status +Always render a still frame from the voxel data sequence +Factor ++Z +Numpad 4 +Type +Action Groups +Styles +Buoyancy +rv +Number of frames to show before the current frame (only for 'Around Current Frame' Onion-skinning method) +Only allows given density value in emitter area. +Description of the property for tooltips +Area in a subdivided screen, containing an editor +IK Z Maximum +Effect fader position +Particle System to render as points +Vertex Group Size Negate +Simplify Subdivision +Warp +3D View center is locked to this bone's position +Enable cluster collision between soft and rigid body +04 - Theme Color Set +Lamps +Color Picker Type +Location of the hair key in its internal coordinate system, relative to the emitting face +Properties Space +The view mode to use for displaying sequencer output +Hold +Prefetch Frames +Pose Tail Position +Amount of pixels to extend the baked result with, as post process filter +Dummy +Deliver full combined RGBA buffer +Long Key Selected +Extension +Complete Matches Only +Lines +The external source data file to use +The time (in minutes) to wait between automatic temporary saves +Undo Memory Size +Type of event mapping +Animation Data +Unique node identifier +Draw white edges +Show Menus +W +Inverse Kinematics +Number of times a map will be rendered recursively (mirror effects.) +Density is calculated as a factor of default density (depends on particle size) +Soft +Use a maximum distance for the field to work +Has IK +Power of Fresnel for transparency (Ray or ZTransp) +Name of PoseBone to use as target +Display files as thumbnails +Transparency blending mode +Multiple Engines +Bits +Active Boid Rule Index +Child Of +Metric +Proxy size 100% +Module name +Visible +NLA Strip references some Action +Average screen dimension of stars +Converter Node +Mirror +Method of calculating aerodynamic interaction +Curl +Main Objects +Only include channels relating to selected objects and data +Set audio mixing buffer size to 256 samples +Bake normals +Uses direction of strands as normal for tangent-shading +Textbox Width +Plasticity +Object scale factor +Boid effector weight +Mass Vertex Group +Fight +Adjust the offset to the beginning/end +Bone Solid +NLA Strip representing a sound event for speakers +Build free run time code index using Record Date/Time +End frame displayed in the sequence editor after offsets are applied +NLA Strip acts as a container for adjacent strips +Offsets image vertically from the world origin +Inverse Lift +Maximum for slider +Mode of automatic keyframe insertion for Objects and Bones (default setting used for new Scenes) +Render Solid faces in this Layer +Rotation style in the viewport +Active Vertex Color Index +Show the active object's smoke cache +Action Extrapolation +Resolution X +Mesh +Progress Bar Widget Colors +Lock editing of rotation in the interface +Draw faces over the image +Press +Weight Color Range +Collection of vertex colors +Thickness of strokes (in pixels) +Resolution V +Particle Target +Object duplicate transformation matrix +Luma +Blend Out +B +B-Bone X size +Handle Vertex Size +IK Lin Weight +Negative +End Still +Y Offset +Edge +Amount of stickness to surface collision +Bone Matrix +Randomizes ring dimension and line location +Velocity +Respect the frame rate rather than rendering as many frames as possible +Distance to the view location +High res +Object to take point data from +Falloff type for proportional editing mode +Region width +Border Minimum Y +Flash Video +Active Section +Channel defining pose data for a bone in a Pose +Smoothed high quality interpolation, but slower +Sets the audio sample rate +Deliver raytraced refraction pass +Land Personal Space +Curve Splines +Operating system key pressed +14 - Theme Color Set +Grease pencil data for this space +Child particle interpolated from simulated or edited particles +Frequency +Select Head +Catmull-Rom +GLSL Nodes +Make edges 'sail' +Scattering +Unit +Bezier Points +Frame on which the simulation starts +Animation Player +Sequence Crop +Autoname +Dying +Floor +True when the property is hidden +Cache Compression +Keep Root +Render Output Directory +Multiple Caches +External Shadows +Points V +Show Debug Properties +White Level +Framing Color +Line Feed +Logarithmic dissolve +Circle +Show movie files +Maximum distance for the field to work +Vertex Group Kink +Enable anisotropic friction +Use color management for GLSL rendering +Exec Screen +Render Layer +Validity +Show sensors of all selected objects +Tessellation +- +F-Curve Modifier's effects will be tempered by a default factor +Paths Type +Cine-Scope 24fps 2048x858 +Use Mist +Object Duplicate Matrix +Repulsion force to apply on cloth when close to colliding +Marker is temporary +Collection of screens +Lock X Axis +Octree Resolution +Custom Color Set +Texture Context +Active Vertex Group +Bounding box of this object represents the computational domain of the fluid simulation +Edge Color +Datablocks +Channels of the image to draw +Adjust simulation speed. +2D Cursor +Constant QMC +Shape Key Curve Point +Command output +turbulence_strength +Color used for active bones +3D View center is locked to this object's position +Vertex groups of the object +Weights for the vertex groups this vertex is member of +Invert Axes +Euler Rotation +Material to override all other materials in this render layer +Tag Sharp +Is part of an IK chain +Output image in JPEG format +Main Groups +Group datablocks. +Slider Min +Side +Bone +Square (HV + S) +Transforms include effects of parenting/restpose and constraints +Name of operator to call on input event +Particle Speed +Motion Blur +Nurb V-lines +Font size to use for displaying the text +Tools +Float +Dynamic +Scene +Color curve mapping to use for displaying the image +Set audio channels to 4 channels +Free handle color +16-bit Signed +Active object for this scene +Previous Angular Velocity +Material Link To +Solid Light +Property Value +Worldspace distance over which to blend in the surface normal +NLA Strip is active +Mini Axis Size +Multiply direct lighting with ambient occlusion, darkening the result +Moving things with a mouse drag confirms when releasing the button +Show Render +Camera this timeline sets to active +Update Automatically +Inwards component of the vortex force +Edit texture nodes from Brush +Current perspective matrix of the 3D region +Opaque +Goal (vertex target position) friction +All rules are averaged +Grease Pencil Stroke +Text datablocks. +Display Object Info +The maximum distance from which a boid can attack +Metaball datablocks. +Both Z +Textbox Y Offset +Particle Brush +Ogg Theora +Logic And +Identifier of operator to call on input event +Uses the vertex normal to specify the dimension of the halo +Set audio channels to stereo +Order V +View & Controls +Rec Run +Upward spring force, when inside the physics distance area +Active index in vertex group array +Mesh Texture Face Layer +Transformation orientation +Gives a radial field toward the center of object +layout +Extend +Collision margin for soft body. Small value makes the algorithm unstable +box radius +Cache Index +Free +Inbetween Move +Packed File +Capsule +UV projector used by the UV project modifier +F-Curve Modifier has invalid settings and will not be evaluated +Dopesheet +Only Selected +Replace Text +Freq +Sets maximum Y value for the render border +Compositing nodes +Waveform Opacity +Layers that contain something +Skip Save +Same Types +Include Missing NLA +Level +Free Unused Nodes +Maximum distance to apply repulsion force, must be greater then minimum distance +Display tooltips +Hold RMB Open Toolbox Delay +Random variation of friction +Proportional Editing Falloff +Object Modifiers +Logic Xnor +Move to center of neighbors and match their velocity +Stretch or squeeze the viewport to fill the display window +X +Show frame numbers of Keyframes on Motion Paths +Shaded +Enhance the resolution of smoke by this factor using noise +Backdrop +Selected +Refraction Exclude +Enable bitmap text on face +Button4 Mouse +The direction that the OpenGL light is shining +Images are rendered without forcing UI changes, optionally showing result +A circular Hue/Saturation color wheel, with Value slider +Input 3 +Input 2 +Input 1 +Engine to use for rendering +Active UV Texture Index +Include the render time in the stamp image +Disabled +Sets the amount mirror reflection for raytrace +Game Object Settings +Clear +Max Physics Steps +Find All +3D View far clipping distance +Activate or deactivate item +Blobby element in a MetaBall datablock +Only Render +Show Navigation Guide +Default Colors +Sets the dimension of the sub-flares, dots and circles +Dynamic Friction +fi_FI +NodeTree +Display the object solid, lit with default OpenGL lights +Use Global Coordinates +Use the initial length as spring rest length instead of 2 * particle size +Priority +Render polygon transparent, depending on alpha channel of the texture +Active File +Manually determine the number of threads +User Defined +Vertex group to control clump +Enable/Disable Constraint +Object is detected by the Near and Radar sensor +VBOs +Select Mouse +The Drivers/Expressions for this datablock +Individual Centers +Enables automatic saving of preview images in the .blend file (Windows only) +Shape key in a shape keys datablock +Use left Mouse Button for selection +Pivot around the 3D cursor +Auto +Registered +Flares Sub +Short List +Sounds Directory +Interpolate +Game engine properties +Allow drawing multiple strokes at a time with Grease Pencil +Output image in (old!) SGI IRIS format +Left Alt +Sub Level Menu Open Delay +Number of frames at start of strip to fade in influence +Keyframe Points +Noise algorithm - Voronoi F3: Returns distance to the 3rd closest feature point +Display error text +Vertex group for fine control over structural stiffness +RNA Path (from ID-block) to property used +Info +User preferences space data +C +Emit Exclude +Thumbnails +Collision Sensor, detects static and dynamic objects but not the other collision sensor objects +Lamp Sky Settings +3D View center is locked to the cursor's position +Manoeuvre to avoid collisions with other boids and deflector objects in near future +Global gravity weight +Curve or Surface subdivisions per segment +The nominal number of game frames per second. Physics fixed timestep = 1/fps, independently of actual frame rate +Object datablocks. +Back scattering (-1.0) to Forward scattering (1.0) and the range in between +Library Path +Calculate shadows while rendering +Defines the strength of environment light +Mux packet size (byte) +Croatian (Hrvatski) +Gimbal +Separate Colors +Collider Friction +Goal minimum, vertex group weights are scaled to match this range +Gamma Cross +Driver for the value of a setting based on an external value +Unit System +Highlight Line +Constraint is the one being edited +Draw F-Curves using Anti-Aliasing and other fancy effects. Disable for better performance +Keying Set +UV Local View +Changing edges seam re-calculates UV unwrap +Any Type +Image Paint +Set audio mixing buffer size to 16384 samples +Creates turbulence with a noise field +Active EditBone +Brush +Show only sensors connected to active states +Disable simulation of angular motion along the Z axis +Shape used as a relative key +World Stars +Use Environment Lighting +X Location +Auto Save Temporary Files +Output image in OpenEXR format +Center +Air has normally some thickness which slows falling things down +Parameters for the function +Keep root keys unmodified +Interpolate new particles from the existing ones +Include visualization of Node related Animation data +25% +Sets the number of simulation substep per physic timestep, higher value give better physics precision +Space in which transforms are used +16x +Sets the number of images of a movie to use +Callback function defines for built-in Keying Sets +20 - Theme Color Set +How much heat effects smoke motion, higher value results in faster rising smoke +Display when not linked to a visible states controller +Collection of scenes +256 +Smooth View +Choose shading information to bake into the image +Sets the number of star shaped lines rendered over the halo +Textures +Active spline +Maximum bending stiffness value +Eye Separation +Window event timer +Armature EditBones +Game engine actuators to act on events +End frame of range of paths to display/calculate (not for 'Around Current Frame' Onion-skinning method) +Quad Split +Auto handles clamped to not overshoot +How much the spring has to be stretched/compressed in order to change it's rest length +Show Brush On Surface +. +Error Limit +Handle 2 selected +Use lights for GLSL rendering +Groups +Textured +Camera rotation in horizontal axis +Blender RNA +Type of ID-block that can be used +Column number to show right margin at +Game Soft Body Settings +Activity Culling +Local Space +Sets the layer as active for rendering +Rotate From Normal +IK Y Lock +Amount of influence constraint will have on the final solution +The window relative horizontal location of the mouse +Set audio mixing buffer size to 2048 samples +Lighting Mode +Object to use as projector transform +Numpad - +Location to store the proxy files +Add directed noise to the density at render-time +Physics Sub Steps +Mesh Faces +Apply on spline +Render Halos in this Layer (on top of Solid) +Nla Strips +Weight used by the Bevel modifier +Color range used for weight visualization in weight painting mode +Boid Rules +Delay between repeated pulses(in logic tics, 0=no delay) +Billboard Time Index UV +Game Data +IK X Limit +Theora +Hook +Collection of materials +Lifetime mapped as 0.0 - 1.0 intensity +Vorbis +Allow Land +Tip select mode +Limit the texture size to save graphics memory +Game engine user defined object property +Sticky vertex selection disabled +Display an isolated sub-set of objects, apart from the scene visibility +Straight Alpha +Wheel Out +Sequence Proxy +Text displayed and edited in this space +Custom Object +Numpad + +Menu +Active Point Cache Index +Starting frame of the stored range +Bake displacement +Emphasize position of keyframes on Motion Paths +Libraries +Brush datablocks. +Quadratic Drag +Display X Axis +Copy of the colors associated with the group's color set +Use a Mitchell-Netravali filter for anti-aliasing +ID of the item +Marker selection state +Good smoothness and speed +Use Onion Skinning +Draw type for drawing UV edges +id +Result strip replaces the accumulated results by amount specified by influence +Transform Space +Speed factor +Collection of group sockets +Highlight Keyframes +Hide files/datablocks that start with a dot(.*) +Use 3D transform manipulator +Value of shape key at the current frame +Python +Save tiles for all RenderLayers and SceneNodes to files in the temp directory (saves memory, required for Full Sample) +Perspective Matrix +Meta strip stack, last is currently edited meta strip +Noise algorithm - Voronoi F2: Returns distance to the 2nd closest feature point +Auto Keyframe Insert Keying Set +2D Cursor Location +Group Index +Add hairs +Bake textures +Crop to Border +Initial boid health when born +When rendering animations, save JPG preview images in same directory +The number of grid lines to display in perspective view +Worlds +The distance between 3D View grid lines +Tag Bevel +Negate the effect of the kink vertex group +Use viscoelastic springs instead of Hooke's springs +Theme settings for the 3D View +Frameserver Port for Frameserver Rendering +Shows actuators for this object in the user interface +Show Info +Grease Pencil Euclidean Distance +Pixels moved by mouse per axis when drawing stroke +Color balance parameters for a sequence strip +Collision Quality +Triple Buffer +Face is used for shadow +Include visualization of World related Animation data +Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory +Regular Widget Colors +Y +Bezier Curve Point +To node +Puff Mode +Root +Deliver Z values pass +Mesh datablocks. +Coordinates of the control point +Transforms don't include parenting/restpose or constraints +Keying Set Path +Friction force if a collision happened. (higher = less movement) +Theme settings defining draw style and colors in the user interface +MPEG-4(divx) +Display reference images behind objects in the 3D View +Collection of Node Links +Follow Leader +Hide objects on these layers when generating the Environment Map +Line Number +Fields per Frame +Harmonic Damping +Weight hair particles +Use the Blender internal rendering engine for rendering +Rotation/Scaling Pivot +Minimum radial distance for the field's fall-off +Duration +Causes curve data to be duplicated with the object +Absolute +pt_BR +Active Layer +YCbCr (ITU 601) +Average distance between any two stars +Multitexture materials +GLSL +Current Scene +How many keys to make new particles with +Hide element +Main Meshes +Text character formatting settings +Main Material +Collection of object modifiers +Maximal resolution used in the fluid domain +Amount of light that gets emitted by the volume +Grid +Use For Growing Hair +Parent edit bone (in same Armature) +Use a column layout for toolbox +Sort by time +When transforming strips, changes to the animation data are flushed to other views +Theme settings for widget color sets +Inner Thickness +Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info) +Constant Jittered +Weight to assign in vertex groups +Bone Armature-Relative Matrix +Rest length of the harmonic force +user_preferences +Scopes to visualize image statistics. +Alpha Under +RNA property definition +YXZ Euler +Use shadows for GLSL rendering +IOR +Gives the flare extra strength +Editor menu containing buttons +Right handle selection status +Minimum Value +Action referenced by this strip +Path edit mode +Smooth falloff +Preferences related to viewing data +Lock to Cursor +A square showing Hue/Value, with Saturation slider +D +Material slot in an object +Set audio sample format to 8 bit unsigned integer +User defined integer number value in an integer properties layer +Output image to a frameserver +Single Layer +Radius of boids personal space in air (% of particle size) +YCbCr (Jpeg) +Length +Specular +Proportional Editing using connected geometry only +Convex Hull +Mid-range quality and speed +Scale of the added turbulent noise +Only use complete matches of search string +Show Splash +Wind +Repulsion Force +Method used to convert stroke to bones +Show Pose Markers +Frame on which the simulation stops +Warp Data +Key angular velocity +select_start +Show Linked to Controller +Struct in which this struct is always nested, and to which it logically belongs +Include a custom note in image metadata +Log conversion gamma +Transform Orientation +Number of CPU threads to use simultaneously while rendering (for multi-core/CPU systems) +Which style to use for font kerning +Fall-Off +Render voxels from a Blender smoke simulation +Draw the points which make up the strokes (for debugging purposes) +Motion +Original image height +Use face for collision and ray-sensor detection +Around Frame +Image Strip +Bounding Box +Device up/down directly controls your Z position +The Runge-Kutta ODE solver error limit, low value gives more precision, high values speed +Original image width +Show Margin +Viewpoint Object +System +Spherical Panoramic +Onion Skinning settings for animation visualisation +KeyMap Items +Valid +MP2 +Handle 2 Type +Italic +Material Raytrace Mirror +Object Grouped Active +Use Frame Rate +sv_SE +Samples +Name +Material mode to use for rendering +Cube +Result color of the volume, after other light has been scattered/absorbed +Use Min +Display the center and axis during rotation +Multiplier for intensity values +Render Edge-enhance in this Layer (only works for Solid faces) +/ +Arabic (العربية) +Most compact representation. Uses '+' as separator for sub-second frame numbers, with left and right truncation of the timecode as necessary +Filter 2D +Lift +Lighting for a World datablock +External +Collection of metaballs +General rotation damping +Constraint name +Hardness +Syntax highlight for scripting +Edit Path +Rot Matrix +Global Time +Grease Pencil Manhattan Distance +Grouping Method +Lock view rotation in side views +Effector Group +Collection of armature edit bones +Flare +Control Point selected +Freehand curves defining the sketch on this frame +Make this nurbs surface act like a Bezier spline in the V direction (Order V must be 3 or 4, Cyclic V must be disabled) +Frames +Near +Use the pinned context +Display files as a detailed list +On Selected Bones Only +Has Reports +Property +Collection of related sketches +Control point mass values +Chance that the particle will pass through the mesh +Sticky Selection Mode +Font +Key Modifier +Clip +Edit texture nodes from Object +resolution_y +Storage of an operator being executed, or registered after execution +Image +Density Scale +Active Render Layer +Space DopeSheet Editor +Maximal +Indirect Factor +Pixel Filter +Upper field first +Static +AVI +Internal Friction +Global Hair +Traditional Chinese (繁體中文) +Bake Specular colors +DopeSheet space data +Registered Optionally +Causes actions to be duplicated with the object +Enable collisions with other objects +Theme settings for the Properties +Region ID +Strength +Use nodes for GLSL rendering +General Mass value +Damping Factor +Show Paint +Weight of a particle dupliobject in a group +Shows controllers for this object in the user interface +Allow the use of colors indicating constraints/keyed status +Target Object +Texture Paint +Defines how AO mixes with material shading +Driver Variable +Wrap words if there is not enough horizontal space +Point in a shape key for Bezier curves +Directory/name to save animations, # characters defines the position and length of frame numbers +Follow Path +Use a cubic filter for anti-aliasing +Media First +Tree Type +Draw Frames +Length of rays, defines how far away other faces give occlusion effect +Lock Scale +Method of attenuating density by distance from the point +8-bit Unsigned +File Paths +Point Source +cs_CZ +Pose Space +Sort the file list alphabetically +Use a custom transform orientation +Maximum number of frames on either side of the active frame to show (0 = show the 'first' available sketch on either side) +Restrict Frame Range +Collision Type +Collection of node trees +Stiff Quads +Occlusion Resolution +Apply sun effect on sky +Stamp Note Text +Align the transformation axes to average normal of selected elements (bone Y axis for pose mode) +Scene layers included in this render layer +Weight used by the Bevel modifier 'Only Vertices' option +IK Y Stiffness +The default directory to search for texture plugins +Vertex Group Velocity Negate +Modifiers +Invoke Region Window +Auto Perspective +Module +The clarity of the refraction. Values < 1.0 give diffuse, blurry refractions +Display Camera +Subdivisions +Blendfile Data +Location of custom proxy file +Solidify +Do a full redraw each time, slow, only use for reference or when all else fails +Horizon Spread +06 - Theme Color Set +Show a visualization of physics bounds and interactions +Z +Quick Cache +Show Error +Left +Property that stores arbitrary, user defined properties +UV 4 +Scattering color +UV 1 +UV 3 +UV 2 +Handle 2 +Display datablocks in visible layers +Handle 1 +True if this map is ready for use, False if it needs rendering. +Active Keying Set Index +SMPTE (Full) +Use textures to affect material properties +Draw Modified Edges +Maximum caused damage on attack per second +Shape Key +Enable file compression when saving .blend files +Anti-Aliasing Level +Frame rate for the screencast to be played back +MPEG-1 +Use Sketching Sessions +MP3 +Use ObColor instead of vertex colors +Lock X Rotation Axis +Envelope Tail Radius +Causes armature data to be duplicated with the object +The menu label +Allow Flight +Keyed timing +Free Run (rec date) +Use a 3D manipulator widget for controlling transforms +Insert Keyframes - Only Needed +Scale factor along the X for items in this (sub)layout. +Bone is not visible when it is not in Edit Mode (i.e. in Object or Pose Modes) +Inverse Quadratic +ru_RU +Use the value from some RNA property (Default) +Calculate point velocities automatically +Actions +Modifiers affecting all the F-Curves in the referenced Action +Enables automatic saving of preview images in the .blend file +Animation Player Preset +16 - Theme Color Set +Vector handle color +Proxy render size +Clip Max X +Clip Max Y +Open in thumbnail view for images and movies +Physics Engine +Description +Sort files by size +Particle Cache +Action Influence +Envelope +View Perspective +IK X Maximum +Boid States +Display datablocks of selected objects +Full Sample +Animation data for datablock +Channel +Interpolation mode used for first keyframe on newly added F-Curves. Subsequent keyframes take interpolation from preceeding keyframe +Order U +Timecode +Distance moved by mouse when drawing stroke (in pixels) to include +Calculate radiosity in a pre-process before rendering +Selected to Active +For RGB curves, the color that black is mapped to +Mesh Texture Face +E +For Pose-Mode drawing, only draw ghosts for selected bones +Landing Smoothness +Grease Pencil Frame +Shift +Mouse Move +Button 3 +Auto-detect +Space Timeline Editor +Only Selected Keyframes Handles +Use smoke density as texture data +Operator has a set of reports (warnings and errors) from last execution +Layered +Object Vertices +Set audio mixing buffer size to 512 samples +Duplicate Metaball +Saves this datablock even if it has no users +Cine-Scope 48fps 2048x858 +Ad-hoc correction for over-occlusion due to the approximation +Line Info +Filtering Group +Choose the method used to split a quad into 2 triangles for baking +Menu Item Colors +Blending factor for Fresnel +Constant +Mitchell-Netravali +Color +Button 8 +IK solver for which these parameters are defined, 0 for Legacy, 1 for iTaSC +Include visualization of Camera related Animation data +Free Run +Opacity of the points +Button 9 +Collection of speakers +Adaptive QMC +Layers the object base is on +Sort by size +Friend +Velocity Min +The brightness of the icon +Show the active object's cloth point cache +Invoke Default +Amplification +Display warnings +Realtime +Size of the font used when rendering stamp text +Refraction +Third input for the effect strip +Snap to vertices +Global child particles percentage +Faces collide too, can be very slow +Disable collision for this object +Disable the time difference between fields +Automatic keyframe insertion in available curves +Bake the normals in camera space +Show Header +layers +Color for all strokes in this layer +Top Level Menu Open Delay +Exec Area +Auto Render +Type of periodic offset on the curve +Key location +Use scaled and grid-fitted kerning distances +Stars setting for a World data-block +Burn +Set audio sample format to 24 bit signed integer +Standard +0 +Tag Crease +Image Sequence +Function is registered as callback as part of type registration +UV Layer to control billboard normals +Auto-Keying Mode +Bitrate +Back scattering weight +Select where rendered images will be displayed +The shape of the reflection, from 0.0 (circular) to 1.0 (fully stretched along the tangent +A random rule is selected for each boid +AutoMerge Keyframes +Hold the first frame if no previous strips in track, and always hold last frame +Active PoseChannel constraint +Scene Bases +Vertex Colors +Collection of mesh faces +string +Live search filtering string +Sequencers active strip +Number of scene samples to take with motion blur +Vertex Group for pinning of vertices +Display libraries +The number of fields per rendered frame (2 fields is 1 image) +Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source) +Frame of referenced Action to evaluate +Line Error +Plus +Coordinates +Roll CW +Envelope Control Point +Maximum number of lines to store for the console buffer +Source List Text +The file extension used for saving renders +Last selected element +Radial falloff power (real gravitational falloff = 2) +Face Normal +Fluid Simulation Settings +Disable or enable the render layer +Tap +Active Bone Group +Show render related properties +Number of vertical pixels in the rendered image +Child of this pose bone +Location of Center of mass +Show background image in back view +Max Land Acceleration +3D View +Snap to actual frames/seconds (nla-action time) +Two-side +Tag +Enables Anti-aliasing +Smoke domain settings +Tab +Default Closed +SPH Fluid Settings +Dome physical configurations +Percentage scale for render resolution +Front-Truncated +Has the current session been saved to disk as a .blend file +12 - Theme Color Set +Box +Constraint modifying the transformation of objects and bones +How much density effects smoke motion, higher value results in faster rising smoke +Adjustment Layer +Velocity Scale +Field of View of the Dome - it only works in mode Fisheye and Truncated +Jitter +Audio Window +Use Grease Pencil +Filter Blender +Start frame displayed in the sequence editor after offsets are applied, setting this is equivalent to moving the handle, not the actual start frame +Create springs for this number of frames since particles birth (0 is always) +Label +Object this base links to +Apply channel rotation as IK constraint +PCM +Percentage +Render Sky in this Layer +Red +pl_PL +Datablock whose nodes are being edited +Draw user interface text anti-aliased +Head +Subdivide stroke in bones of specific length +Use the depth under the mouse to improve view pan/rotate/zoom functionality +Texture to use as force +RNA type definition +PIZ (lossless) +Bit depth per channel +Billboard Split UV +Pxr24 (lossy) +Region height +Heat +Particle select and display mode +Normalized +Mux Packet Size +Diameter in Pixels for Object/Lamp origin display +Distance between subsequent volume depth samples +Swap the Mouse Wheel zoom direction +Sequence editor space data +The context in which the panel belongs to. (TODO: explain the possible combinations bl_context/bl_region_type/bl_space_type) +Bake from Multires +Start size of strands in pixels or Blender units +Curve datablocks. +Targa +Particle Instance +Bezier V +Multiplier to bring particle speed within an acceptable range +Collision Group +Limit effectors to this Group +Display datablocks of all objects of same type as selected object +The constraint is applied relative to the local coordinate system of the object, with the parent transformation added +Deliver normal pass +Location of tail end of the bone +The transformation of the target is evaluated relative to the world coordinate system +File Path +O +FLAC +UV Layer to control billboard time index (X-Y) +Blender Units +Vertex Group Tangent Negate +Set color of selected color stop +Pivot center for rotation/scaling +Set audio sample format to 16 bit signed integer +Zooms in and out based on horizontal mouse movement +Invert Zoom +Alpha Mode +bl_use_postprocess +Land Stick Force +Create empty placeholder files while rendering frames (similar to Unix 'touch') +Face Collision +Automatic keyframe insertion for Objects and Bones +Damp +Disable simulation of angular motion along the X axis +RNA Array Index +Unsigned Number +Output video in MPEG format +Dead +Text Widget Colors +Auto Save Time +Freehand curve defining part of a sketch +Header Text Highlight +Seed +True when the Ctrl key is held +Raytrace Acceleration Structure +Which direction is used to calculate the effector force +Addon Key Configuration +Data point for freehand stroke curve +Number of cone samples averaged for blurry reflections +F8 +Filter Sound +Mass of cloth material +Matrix +Add light coming from the environment +Action Group that this F-Curve belongs to +Subdivide stroke adaptively, with more subdivision in curvier parts +How many steps to draw the path with +Space Text Editor +Handle Vertex +Render face two-sided +Mist uses inverse quadratic progression +DV +Has Maximum +Skip Quad to Triangles +Number of times to repeat the action range +Maximum Distance +is_baked +Amount of damping during collision +F9 +8192 +X Offset +Image Pin +Accuracy of attack +Continuously unwrap the selected UV island while transforming pinned vertices +Collection of grease pencils +Exclude raytraced reflection pass from combined +Choose normal space for baking +Boid state for boid physics +Occluder for optimizing scene rendering +Axis Angle +Field settings for an object in physics simulation +Rotation Mode +Active Spline +Provides an alternative access to loc/scale/rotation relative to the parent and own rest bone. +The region where the panel is going to be used in. +Element of a curve, either Nurbs, Bezier or Polyline or a character with text objects +Start player with a visible mouse cursor +Bars +Armatures active edit bone +Breakdown +Color Mode +Diffuse +01 - Theme Color Set +Start position of the marker in the line +Consider objects as whole when finding volume center +Iris +Save Buffers +Time Scale +Split quads predictably (1,2,3) (1,3,0) +Constraint +Display Hidden +Receive shadows from sources outside the volume (temporary) +Required +No Ghosts +Display Speaker +GLSL Ramps +Point data to use as renderable point density +Keyframe insertion only when keyframe needed +Audio Sample Rate +Area width +Whether to draw the sound's waveform. +Time +Texture datablock used by this texture slot +Draw Waveform +DPX +Expression +Voxel data settings +Constraints +State Colors +Influence setting is controlled by an F-Curve rather than automatically determined +Number of frames between paths shown (not for 'On Keyframes' Onion-skinning method) +Set audio sampling rate to 48000 samples per second +Order of video fields. Select which lines get rendered first, to create smooth motion for TV output +Surface Diffuse +Magnetic +Stamp Background +Radius of the activity bubble, in Manhattan length. Objects outside the box are activity-culled +Show Warn +When bone has a parent, bone's head is struck to the parent's tail +Timer 0 +Timer 1 +Timer 2 +Display Y Axis +Frame player from IRIDAS +Children +Zoom To Mouse Position +Shadows +Use High Quality Drawing +Exclude emission pass from combined +Vertex Group Size +Plane +Drivers +Particle system in an object +Shader Nodes +Deliver environment lighting pass +Soft to Soft Body +Expanded in the user interface +After Current +Mix +Object Color +Fresnel +Main Cameras +Atmosphere Extinction +Use Indirect Lighting +Elastic Limit +Material Slot +Resolution of raytrace accelerator. Use higher resolutions for larger scenes +Falloff Power +Mesh Deform +Show influence curves on strips +Tweak timing for physics to control frequency and speed +IK X Stiffness +Theme settings for the File Browser +Images are saved with RGB (color) data +1 +Textured Fonts +Data type of the property +Gain +Scale X +Is Perspective +IK Z Stiffness +B-Bone Display X Width +Space Console +Handle type for handles of new keyframes +Left Mouse +Macro +Average +Curve +Sketches for this layer on different frames +Vector font datablocks. +Error Tolerance +Axis of mouse movement to zoom in or out on +Disable auto (de)activation in physics simulation +Softness +Inherit Scale +Graph Editor +Method of shading, attenuating, and scattering light through the volume +View +Position Iterations +H.264 +Romanian (Român) +Still Frame Number +Extension Filter +Vertex Group Roughness End Negate +Specular Colors +Minimal Info +Face selection mode +Reflection Color +Node Editor +Proportional distance over which the light is diffused +Use Local Coords +Zmask Negate +Property that gives the name of the struct +Rotation in quaternions (keep normalized) +On Keyframes +Pulse False Level +Animated +Main Grease Pencils +Alpha Sort +Factor for ambient occlusion blending +Active vertex color index +Generator +Author +Restrict Animation Updates +Lock editing of four component rotations by components (instead of as Eulers) +NLA Track is evaluated itself (i.e. active Action and all other NLA Tracks in the same AnimData block are disabled) +The diffuse color of the OpenGL light +Do not calculate lighting and shadows +Cut +Starting distance of the mist, measured from the camera +Damping +Movie Format +White +Sets the strength of the add effect +Collection of lamps +Parent bone (in same Armature) +Environment Maps +Inputs +Direction +group +75% +Hide this curve in editmode +Deformed Location +Include visualization of Lattice related Animation data +Weighted result of strip is multiplied with the accumulated results +Cloth Settings +Sharp edge for the EdgeSplit modifier +Collection of groups +window +Preset +Theme Outliner +Fast Navigate +Draw Smooth Edges +Collection of curves +Star Tips +NLA Evaluation Enabled +3D Cursor Location +Spline Bezier Points +Stereo +Page Up +Negate the effect of the field vertex group +Collide All +Items Expanded +Marker for noting points in the timeline +Z Direction +Causes lamp data to be duplicated with the object +Scene Strip +Boid state name +Simulation value to be used as a texture +64-bit Float +Domain Object +Surface subdivisions per segment +Shape of clumping +XZY Euler +Group Sockets +Individual pose bones for the armature +Min Step +Manipulator Scale +Main Armatures +Die Time +Number of frames to show after the current frame (only for 'Around Current Frame' Onion-skinning method) +Placeholders +name +Unfitted +Simple +Mesh Selection Mode +Method to draw in the sequencer view +Mute +Down Arrow +Render Strands in this Layer +Child Particles +Duplicate Action +IK Param +Main Images +Weight for cloth simulation +Index number of the vertex group +Collection of NLA Tracks +Sculpt/Paint Use Unified Strength +Audio Mixing Buffer +ID-block that the specific property used can be found from (id_type property must be set first) +Linear physics +Use Collision Bounds +Passes +Noise algorithm - Original Perlin: Smooth interpolated noise +Additive +Handle 2 selection status +Trigger controllers only for an instant, even while the sensor remains true +Loose edge +Edit animation/keyframes displayed as 2D curves +Sculpt/Paint Use Unified Radius +Index to the specific property affected by F-Curve if applicable +Main Window Managers +Unit to use for displaying/editing rotation values +Editmode bone in an Armature datablock +Bending Stiffness Maximum +Selection state of the curve point +Enable pinning of cloth vertices to other objects/positions +Shared +Zoom = Up/Down +NLA Strips +Text to search for with the find tool +Use a DCI Standard preset for saving jpeg2000 +Blend Mode +Space Sequence Editor +Textures Directory +Bone is always drawn as Wireframe regardless of viewport draw mode. Useful for non-obstructive custom bone shapes +Include the name of the active scene in image metadata +F-Curve Name Filter +Time in 1/10 seconds to hold the Right Mouse Button before opening the toolbox +pin_id +Fluid interaction radius +NLA Strip 'transitions' between adjacent strips +Editable +Emission +Template armature that will be retargeted to the stroke +Selection status +Texture slot defining the mapping and influence of a texture +Connected +Key +Align the transformation axes to world space +Transform parameters for a sequence strip +Layer Opacity +Use the Bullet physics engine +Method for generating shadow samples (for Raytrace) +Effect particles' dynamic rotation +Show options for whether channels related to certain types of data are included +G +Collection of group objects +Make hairs shorter +Show properties marked for debugging while the game runs +Greek (Ελληνικά) +Smooth +Sync view position between side views +Active File Text +F18 +F19 +Force effector weight +The distance over which the mist effect fades in +Edge Select +F12 +F13 +F10 +Display Meshes +F16 +Options +F14 +F15 +Output video in AVI JPEG format +Sky Color +blend_data +Temporary Directory +Current rendering engine is a game engine +100% +Vertex Group Roughness 2 +IK Rot Weight +Handle Type +Bevel Weight +F-Curve Modifier Type +int +No Sleeping +Save TIFF with 16 bits per channel +ID Property Group +Island selection mode +Collection of texts +Edges collide too +512 +Sets minimum Y value for the render border +Mouse X Position +Active screen showing in the window +Stamp Note +Number of horizontal tiles to use while rendering +Tilt +Child Particle +Action Start Frame +Media Last +Pass in multilayer image +Back Space +Outflow +Active Boid State Index +Enable cluster collision between soft and soft body +Instance support leads to effective memory reduction when using duplicates +Xvid +Realtime display of a modifier +Sets the layer as active for display and editing +Wireframe +Grease Pencil Eraser Radius +Accurate, but slow when noise-free results are required +Syntax Special +Repeat +Global undo works by keeping a full copy of the file itself in memory, so takes extra memory +Strength of noise +Vertical +Separate +Self Friction +Snap median onto target +Area +Falloff +REC709 +Smooth the normals of the surface or beveled curve +2D View Minimum Grid Spacing +Font Style +2 +3D region in this space, in case of quad view the camera region +Auto Velocity +Data +Bake the normals in world space +Lock Camera and Layers +Vertex group to control rotation +Global +Sun Brightness +Optional custom node label +Align to Normal +Directory displayed in the file browser +Deliver speed vector pass +Enabled +Frame player from Tweak Software +Weighted result of strip is removed from the accumulated results +A animation layer containing Actions referenced as NLA strips +Key configuration that can be extended by addons, and is added to the active configuration when handling events +Dominant +Line Output +Seam edge for UV unwrapping +Options for this panel type +Menu Widget Colors +Main Worlds +Shadowed +11 +Atmosphere +12 +Estimated rotation matrix +16 +Pose +Sun size +Defines if the panel has to be open or collapsed at the time of its creation. +2048 +Anaglyph +Active Object +Collection of curve splines +Marker highlighting a portion of text in a Text datablock +DopeSheet +Magnetic effector weight +Render face transparent and add color of face +Previous Rotation +Display Shapekeys +Aggression +en_US +Color space to use for internal XYZ->RGB color conversion +Numpad 7 +Sets the maximum number of physics step per game frame if graphics slows down the game, higher value allows physics to keep up with realtime +Keying Sets All +Boid +Numpad 6 +Scene datablocks. +Snap Element +it_IT +Include the name of the foreground sequence strip in image metadata +Metaballs +Active particle system being displayed +Toggle between moving the viewpoint or moving the scene being viewed +Use a Gaussian filter for anti-aliasing +ChannelDriver Variables +MetaBall +Combined +FFmpeg video codec #1 +Use Default Fade +Numpad 3 +ZXY Rotation Order. Prone to Gimbal Lock +Index to the specific setting if applicable +Bake Mirror values +Use vBVH +Apply channel size as IK constraint if stretching is enabled +Invert Zoom Direction +Numpad 1 +Edge Sharp +Unit Settings +Stamp Frame +Numpad 0 +Mapping +Snap active onto target +Rigid Body Joint +Rate control: buffer size (kb) +RGBA +Half +Sets the number of rings rendered over the halo +Turbulence +Graph Editor instance has some ghost curves stored +Halo +No display +Stiffness Scaling +Use a custom falloff curve +Contents Follow Opening Direction +Off +Seam +Sculpt +Sequences +Curve Guide +Proportional Editing disabled +Rotate Around Selection +Key Maps +Minimum +Align newly added objects facing the active 3D View direction +Tool Properties +Amount of noise for the force strength +Amount of ray samples. Higher values give smoother results and longer rendering times +Numpad 8 +] +Exclude specular pass from combined +Stamp Scene +Collection of grease pencil layers +Choose Collision Type +Amount to blend in the material's diffuse color in raytraced transparency (simulating absorption) +Mode of automatic keyframe insertion for Objects and Bones +Stroke conversion method +Properties acting as inputs for this driver +Point Cache +Window Manager Event +Collection of brushes +Don't use a physics engine +Material Override +Temperature difference to ambient temperature +State determining which controllers are displayed +PNG +Uses extreme alpha +Node Tree +Before Current +Array +Collision settings for object in physics simulation +Stretch To +F-Curves for controlling the strip's influence and timing +Field Order +Hide Dot Files/Datablocks +Loose +Node tree type to display and edit +Onion Skinning (ghosting) settings for visualisation +Draw dashed black-white edges +Align handle selected color +Minimum number of pixels between each gridline in 2D Viewports +Sky +Spring Frames +Location of head end of the bone +Active key configuration (preset) +Width +Action Group is selected +Collection of Texture Nodes +Collection of add-ons +States which are being used by controllers +Gravity or external force vector +NLA Track is active +Ogg +Roll +Grless +Wheel Down +Amount of friction during particle collision +Search in all text datablocks, instead of only the active one +View pivot location +Draw image with RGB colors and alpha transparency +Resolution +Use the scene's active camera and layers in this view, rather than local layers +Every point is effected by multiple springs +Vertex +Include the filename of the .blend file in image metadata +Output video in H.264 format +Action displayed and edited in this space +History +Local View +Translation +IK Y Maximum +File Select Parameters +Shared Vertex +Safe Margin +Tip Size +Edge color +Negate the effect of the size vertex group +Game engine controllers to process events, connecting sensor to actuators +Triangle Mesh +NLA Strip is played back in reverse order (only when timing is automatically determined) +Scale Y +H +Main Lamps +Approximate +Controllers +Separate Units +The number of old versions to maintain in the current directory, when manually saving +Theme settings for the NLA Editor +Nearest Marker +Randomize star colors +Theme settings for the Sequence Editor +Index of refraction (higher values are denser) +Local Location +Default Key Configuration +Show background image while looking to the right +Right +Quality of JPEG images, AVI Jpeg and SGI movies, Compression for PNG's +Averaged Value +Use a box filter for anti-aliasing +Spin CCW +Color to use for stamp text +Wheel Invert Zoom +Lock Camera to View +New Interpolation Type +Main data structure representing a .blend file and all its datablocks +Calculate bone paths from heads +Layer of vertex colors in a Mesh datablock +Main Textures +Enable soft body shape matching goal +How many self collision iterations should be done. (higher is better quality but slower) +Collection of scene bases +Show right margin +Ambient Occlusion +Frame this control-point occurs on +Snap to edges +Turbulence effector weight +Build record run time code index +float +Use Edges as springs +Rings +Color Ramp Elements +Charge +Thickness +Zmask Layers +RGB +Spread +Cluster Iterations +Location +Weight Paint +15 - Theme Color Set +space_data +Vertex group to control kink +If this is set, the menu gets a custom ID, otherwise it takes the name of the class used to define the panel. For example, if the class name is "OBJECT_MT_hello", and bl_idname is not set by the script, then bl_idname = "OBJECT_MT_hello" +Path is being edited +ShapeKey Editor +AC3 +Set audio channels to 5.1 surround sound +Minimum Size +Path to a custom animation/frame sequence player +Smoke inherits it's velocity from the emitter particle +Display Lists +Compress File +Bezier U +Displace +Velocity Max +Use Right Mouse Button for selection +Box Backdrop Colors +3 +Path point is selected for editing +Bone Group +When calculating Bone Paths, use Head or Tips +Project Individual Elements +Parameters for IK solver +Show the object origin center dot for all (selected and unselected) objects +BLI BVH +Realtime Updates +Shutter +How strongly the fluid tries to keep from clustering (factor of stiffness) +Target +Show controllers of all selected objects +Exec Default +screen +Use large mouse cursors when available +Keymap is defined by the user +Grease Pencil Stroke Point +48 kHz +Use the manipulator for rotation transformations +Bullet +Armature Bones +Directory +TimeCode Style +Identifier +Does full Sky texture render for diffuse energy +Items in the keymap, linking an operator to an input event +AvMinMax +Multiply the current speed of the sequence with this number or remap current frame to this frame +Apply force only in 2d +MPEG +Is this keymap item modified by the user +Zoom in towards the mouse pointer's position in the 3D view, rather than the 2D window center +How smoothly the boids land +region +Swedish (Svenska) +Region in a subdivided screen area +Add indirect light bouncing of surrounding objects +Factor Radius +Obstacle +Color used for selected bones +Line Numbers +Draw edges after modifiers are applied +Space Info +Multicam Selector +Reflection Exclude +Weight of scale constraint for IK +Node editor space data +Link between nodes in a node tree +Show the entire viewport in the display window, viewing more horizontally or vertically +Pixel distance around the handles to accept mouse clicks +Initial State +Sum Values +Tools can use this to tag data, (initial state is undefined) +The default directory to search for textures +Lin error +F-Curve is selected for editing +Keying Sets +Release confirms +64 +Title for the file browser +Sets the audio sample format +Include the name of the last marker in image metadata +Collection of keyframe points +3D View space data +Vortex effector weight +Object adds fluid to the simulation +Use smoke velocity as texture data +Maximum Radial Distance +The axis to display the image on +Keying set options +Horizon Brightness +Render Engine +Display Particle +Exclude AO pass from combined +Lights user to display objects in solid draw mode +Textbox Height +Point coordinates +Axis Angle (W+XYZ). Defines a rotation around some axis defined by 3D-Vector +Text Editor +Use display lists to speed up rendering by keeping geometry on the GPU +Multiplier +Make this nurbs curve or surface meet the endpoints in the U direction (Cyclic U must be disabled) +es_ES +Auto Run Python Scripts +Subtract +Properties in the struct +Set audio sampling rate to 96000 samples per second +Scale to use when converting between blender units and dimensions +Mouse/Trackpad Zoom +X Ray +Use the manipulator for scale transformations +True when this property is an output value from an RNA function +False when F-Curve could not be evaluated in past, so should be skipped when evaluating +Fresnel Factor +Minimum for slider +Use Goal +Sets how the texture is extrapolated past its original bounds +Minimum size of strands in pixels +Points +Motion Path +Emission Color +Global maximum shadow samples +Path +Action +Sets the number of sub-flares +Used State +Show handles of Bezier control points +Update other affected window spaces automatically to reflect changes during interactive operations such as transform +Filter Script +Method to interpolate/smooth values between voxel cells +Gives halo a texture +Show markers belonging to the active action instead of Scene markers (Action and Shape Key Editors only) +Divide +Proportional Editing mode, allows transforms with distance fall-off +Angular distortion between UV and 3D angles +Random variation of damping +Channels Selected +plugin +Spline IK +The frame on which the timeline marker appears +Lamp datablocks. +Handle 1 selected +Free all image texture from memory after render, to save memory before compositing +Method used for combining Active Action's result with result of NLA stack +If enabled, stiffness can be scaled along a weight painted vertex group +Snap to 1.0 frame/second intervals +Display Mode +Text bounding box for layout +Onion Skinning +When false, this (sub)layout is greyed out. +Open +User Add-Ons +Output file format +Size +Backdrop X offset +Active Pose Marker Index +Text Marker +Number of preprocessing passes to reduce overocclusion +Modifiers affecting the shape of the F-Curve +Wheel In +Mesh Face +Rotation Angle +Path to a setting for use in a Keying Set +Sync Markers with keyframe edits +Whether to use minimum clipping value +Main Actions +Editing context being displayed +Raytraced refraction settings for a Material datablock +Retarget roll mode +Hidden +When adding objects from a 3D View menu, either align them to that view's direction or the world coordinates +Only show and edit handles of selected keyframes +Cinema 48fps 2048x1080 +Max Rate +Envelope Head Radius +Use old Octree structure +Global maximum subdivision level +Use this object's coordinate system instead of global coordinate system +Viscosity +Theme Properties +Add/Replace +Force the curve view to fit a defined boundary +Objects +Default (Default) +Shade Down +Grease Pencil Layers +Current Keying Set index +Shadow Exclude +Spring force +Rest Shade Key +Framerate, expressed in frames per second +Scrollback +Overlay Lock +Duplicate Text +Russian (Русский) +10 - Theme Color Set +Left handle selection status +Collection of texture slots +ID Materials +I +The distance from which particles are affected fully +Action Pose Markers +Clamp velocity to this maximum speed +English (English) +JPEG +L +Display only files with extensions in the image select window +Theme Sequence Editor +ID From +All Scenes +Make hairs longer or shorter +With displacement normalize to the distance, with ambient occlusion normalize without using material settings +Physics +ID +Mesh Vertex Color Layer +Use curve weights to influence the particle influence along the curve +Cached location on path +Show background image while looking to the left +Node tree being displayed and edited +Tangent Shading +Mesh Vertex Color +B-Spline +Based on distance/falloff it adds a portion of the entire path +Theme settings for the Audio Window +Displacement +Coordinates of the second handle +Rendering settings for a Scene datablock +Radius of boids personal space on land (% of particle size) +Live Edit +The length of the contents of this strip before the handles are applied +Display Armature +Length Mode +Camera datablocks. +SDL +Collection of Nla Strips +Amount the Active Action contributes to the result of the NLA stack +Show only actuators connected to active states +Vertex group for fine control over bending stiffness +4 Channels +Diffusion factor, the strength of the blurring effect +Acceleration +Angular Velocity +Boid Rule +Action Group +Split quads predictably (0,1,2) (0,2,3) +Struct definition this is derived from +Include the current date in image metadata +Action Group is expanded +Draw title safe margins in preview +Output image in DPX format +Include visualization of Object-level Animation data (mostly Transforms) +Proxy size 25% +16 bit color channels +The default directory to search for sounds +Log +Redraw all overlapping regions, minimal memory usage but more redraws +International Fonts +5.1 Surround +Linear +Settings that should be keyframed together +The shininess of the reflection. Values < 1.0 give diffuse, blurry reflections +Overlap Flip +The active face for this mesh +Turn on SB diagnose console prints +Dome +Brazilian Portuguese (Português do Brasil) +Make hairs stand up +Maximal # solver steps/frame +Key maps configured as part of this configuration +Active Space +4 +Theme Text Editor +Method to display/shade objects in the 3D View +Make this nurbs surface meet the endpoints in the V direction (Cyclic V must be disabled) +Normalized Coordinates +Glow +Diffusion +Enemy +Co-ordinate system to cache vertices in +Show state panel +Show ghosts on keyframes +Anti-Aliasing +Zoom Axis +Reactor Target Particle System +First input for the effect strip +Radians +Free Nodes that are not used while compositing, to save memory +Transform +Free handle selected color +Maximum depth for light to travel through the transparent material before becoming fully filtered (0.0 is disabled) +Button 10 +Amplitude +Defines the structure of the panel in the UI. +Show Active States +Space Nla Editor +Vertex group to control length +In text window, paste with middle mouse button instead of panning +Collection of object constraints +Transparent RGB pixels are multiplied by the alpha channel +Calculates environment map at each rendering +Deform +Choose BW for saving greyscale images, RGB for saving red, green and blue channels, AND RGBA for saving red, green, blue + alpha channels +Tweak Right +44.1 kHz +Include visualization of Texture related Animation data +Set layer Visibility +Deliver mist factor pass (0.0-1.0) +Sort files by modification time +Minimal # solver steps/frame +Have recent edits been saved to disk +Keying Set Paths to define settings that get keyframed together +Pressure of tablet at point when drawing it +Use a tent filter for anti-aliasing +Sharp +Node group datablocks. +Number of spaces to display tabs with +Puff Volume +Video bitrate(kb/s) +Linear Stiffness +Vertex Group Tangent +Amount of dithering noise added to the rendered image to break up banding +Absorption +Find Wrap +Enable hair dynamics using cloth simulation +The type of the Sequencer view (sequencer, preview or both) +Number Widget Colors +File Extensions +Theme Node Editor +Object Duplicate +Goal Maximum +Size of element, use of components depends on element type +Word Wrap +Any +More than one rendering engine is available +Cached positions per frame +Control key pressed +Collection of armatures +Gloss Anisotropy +Tracking by taking the shortest path +Spherical falloff +Objects further than this are not visible to map +Driver could not be evaluated in past, so should be skipped +Insert Keyframes - Visual +Rule Evaluation +Negate the effect of the velocity vertex group +The frame number to always use +ca_AD +Visibility +Bone associated with this PoseBone +Envelope Deform Distance +Invoke Area +Theme Info +Current Keying Set index (negative for 'builtin' and positive for 'absolute') +Lock editing of location in the interface +Interface +Auto Keying Enable +Save luminance-chrominance-chrominance channels instead of RGB colors +Left Ctrl +Multiplier to adjust velocity passed to smoke +Font size and resolution for display +Extreme +Show Controllers +Render engine +Render image to two fields per frame, for interlaced TV output +To socket +Activate TRUE level triggering (pulse mode) +Temp. Diff. +Expanded +Target particle system +Which part to snap onto the target +local space unit length normal vector for this face +Keying Set Name +Python Console +Show Hidden +The region relative horizontal location of the mouse +Nurb active V-lines +Set position of selected color stop +Fixed size UV coordinates array +Reactor Target Object +Display datablocks in current scene +Color and Alpha +Causes texture data to be duplicated with the object +Item in a Key Map +3D View region data +Display face-assigned textures in solid view +Disable simulation of linear motion along the Z axis +Point of a curve used for a curve mapping +Include visualization of Metaball related Animation data +Structural Stiffness Maximum +Factor Density +Simple Deform +The default color for textures that don't return RGB or when RGB to intensity is enabled +Name of UV unwrapping layer +Outputs +Images +Message +Ray +Theme Bone Color Set +Redraw all overlapping regions, minimal memory usage but more redraws (for graphics drivers that do flipping) +IK stiffness around the Y axis +Menu Backdrop Colors +50% +Heads +Stereo Mode +Soft body simulation settings for an object in the game engine +Show Framerate and Profile +Right Shift +Direct conversion of frame numbers to seconds +Log conversion reference whitepoint +Radius +Linear stiffness of the soft body links +SMPTE +Add +Show framerate and profiling information while the game runs +Degrees +Gather Method +Output +Set audio sampling rate to 192000 samples per second +End +Include visualization of Material related Animation data +Sets the layer as active for cloning +Save for every anti-aliasing sample the entire RenderLayer results. This solves anti-aliasing issues with compositing +When bone doesn't have a parent, it receives cyclic offset effects +Enable self collisions +Property is registered as part of type registration +Syntax Comment +Draw Particles +area +Basis Matrix +Active vertex color layer +Image and UV editor space data +Set metaball as negative one +Collection +JPEG Quality of proxies to build +Zbuf +Show the Z axis line in perspective view +Tails +Show Active Object +Defines size of derivative offset used for calculating gradient and curl +Color Set +Integer +Output image in bitmap format +OpenAL +Particle Systems +Display the user preference datablocks +User interface layout in a panel or header +Size of packed file in bytes +Ukrainian (Український) +Mono +No proxy, full render +Fullscreen +Allow scaling of the bone for IK +Creates viscosity for expanding fluid) +J +Blend mode for combining sun sky with world sky +Global Undo +Quicktime +Draw frames rather than seconds +Bake shading on the surface of selected objects to the active object +Frame currently being displayed for this layer +Never None +alignment +Bulgarian (Български) +Light +Maximal Spring length * Ball Size +Emulates Middle Mouse with Alt+Left Mouse (doesn't work with Left Mouse Select option) +Axis-Angle Rotation +Welding +Heavy +Quick Sketching +Method used to determine color of F-Curve in Graph Editor +Show UV Editor +Cut hairs +Expand +Effect particles' location +View Matrix +Allow boids to climb goal objects +Sequence +Bone Name +Seed of the noise +Motion Path Cache Point +Use modifier while in the edit mode +Meshes +For reactor systems, index of particle system on the target object +Billboard +Automatically set based on graphics card and driver +Macro Operator +DopeSheet Channel +Render and combine multiple samples per pixel to prevent jagged edges +Render Z-Transparent faces in this Layer (On top of Solid and Halos) +Output image in uncompressed Targa format +Paths +Left Arrow +Collection of spline bezirt points +Layout +Show Physics Visualization +Number of bones in the subdivided stroke +Stiff viscosity is a factor of normal viscosity +Negate the effect of the tangent vertex group +Base type for IK solver parameters +Re-render and composite changed layer on 3D edits +ISO 2 +Active Layer Index +Esc +Show Frame Number Indicator +End Offset +Use active Viewer Node output as backdrop for compositing nodes +Blender command line animation playback - path to Blender 2.4 +Scroll Handle +Pivot around the median point of selected objects +Blend vertex colors across face when vertices are shared +Game engine logic brick to detect events +Causes the image to repeat horizontally and vertically +Bone location is set in local space +User Preferences +Show Operator +Max Logic Steps +Damping of the harmonic force +Vertex of a simulated fluid mesh +18 - Theme Color Set +Average Speed +Console +Total number points for the surface on the V direction +Disable +5 +13 - Theme Color Set +Vertex group to control field +Shared Location +Transparent pixels are filled with sky color +Atmosphere Turbidity +Widget Style +RNA function definition +NLA Strip is not evaluated +Edge spring stiffness when shorter than rest length +4096 +Right Handle Selected +Defines the structure of the menu in the UI. +Color Ramp +Self Collision Quality +Index of active pose marker +Vertex Group Density Negate +Dome Mode +Image and settings for display in the 3d View background +Process the render (and composited) result through the video sequence editor pipeline, if sequencer strips exist +FPS +Normals +SIMD SVBVH +Minimum distance between collision objects before collision response takes in +Color balance gamma (midtones) +Minimum distance for the field's fall-off +Limit fluid objects to this group +Load UI +Factor Stiff Viscosity +Draw preview using full resolution or different proxy resolutions +Paint Lock +Sets the number of samples used by the audio mixing buffer +Source List +use global timestamp written by recording device +Around Current Frame +NLA Track +Color of the F-Curve in the Graph Editor +Exclude indirect pass from combined +Selection of IK solver for IK chain, current choice is 0 for Legacy, 1 for iTaSC +Bias +Text Input +Pitch +2D +Braid +Modifier name +Use extra textures like normal or specular maps for GLSL rendering +Stamp Marker +ZXY Euler +Function does not pass its self as an argument (becomes a class method in python) +Sun Intensity +Fit +AO Exclude +Integer Property +Tube +ZYX Rotation Order. Prone to Gimbal Lock +Default paths for external files +Solid +Lock the same rotation/scaling pivot in all 3D Views +Groups of F-Curves +Display the object solid, with face-assigned textures +Quadratic +ID-Block that keyframes for Keying Set should be added to (for Absolute Keying Sets only) +Image datablocks. +Inaccurate, but faster and without noise +Unique ID for this region +Lock Y Axis +Logic Nor +Gaussian +Euler +Settings for filtering the channels shown in Animation Editors +Invoke Region Channels +Crop the rendered frame to the defined border size +Limit Location +Radius of the brush in pixels +Automatically select also UVs sharing the same vertex as the ones being selected +Title +Histogram +Display raw datablocks +Bone deformation distance (for Envelope deform only) +Forcefield based on the Lennard-Jones potential +Action Group is locked +XYZ Euler +Outline Width +Upper First +Subdivide stroke in fixed number of bones +Action Clip +Use 16 bit floats instead of 32 bit floats per channel +Stamp Camera +Texture Nodes +3D View near clipping distance +Color Randomization +Snap Peel Object +Determine the amount of render threads used +Amount +F-Curve +Zmask scene layers for solid faces +Bone Group this pose channel belongs to (0=no group) +Constraint's panel is expanded in UI +Collection of Color Ramp Elements +Grease Pencil +Show controllers of active object +Instead of per brush strength, the strength is shared across brushes +Allow boids to move on land +Negate the effect of the clump vertex group +` +Color for newly added transformation F-Curves (Location, Rotation, Scale) and also Color is based on the transform axis +Highlight the current line +Simplify Child Particles +Lattice +Timeline Markers +Draw actual particles +XYZ +Collection of spaces +Bake Mode +The space where the panel is going to be used in. +Sub +Enable Stereo environment +F-Curve defining values of a period of time +Rules are gone through top to bottom. Only the first rule that effect above fuzziness threshold is evaluated +Constraint to stay within the image bounds while editing +Only Selected Curve Keyframes +Scroll Bar +Theme settings for Font +Allow Climbing +Syntax Highlight +ASCII +Properties space data +Handle Vertex Select +Pivot around bounding box center of selected object(s) +Max Res +Mouse Previous X Position +Simplify the final stroke +Frame is selected for editing in the DopeSheet +OS Key +Function is optionally registered as callback part of type registration +Ease +Renders halo as a star +Use the speed vector pass to reduce AO samples in fast moving pixels. Higher values result in more aggressive sample reduction. Requires Vec pass enabled (for Raytrace Adaptive QMC) +nl_NL +Alt key pressed +Limit movement around the Y axis +Z Scale +Actuator +Motion Path for this element +Slider Widget Colors +Name of Vertex color layer +Xnor +Bone Group this pose channel belongs to +Quad View Region +Edge Split +Noise algorithm - Voronoi Crackle: Voronoi tessellation with sharp edges +Max Air Angular Velocity +Use Bone Sketching +Automatic keyframe insertion using active Keying Set only +Colors +Starting frame of range of paths to display/calculate (not for 'Around Current Frame' Onion-skinning method) +Show script files +Cloth simulation settings for self collision and collision with other objects +Object to use as the environment map's viewpoint location +The interpolation type for this curve element +Vertically Open +Show the expanded in the user interface +Emit Object Location +Toggle Widget Colors +Rotation +Current Transformation orientation +Total number points for the curve or surface in the U direction +Active Particle System Index +Material Physics +Pull +List Item Colors +Show a small rotating 3D axis in the bottom left corner of the 3D View +Add-Ons +Render face with texture +Tilt Interpolation +K +Collection of particle systems +Text editor space data +Zoom +Goal minimum, vertex weights are scaled to match this range +When deforming bone, multiply effects of Vertex Group weights with Envelope influence +F-Curve Sample +Radius of eraser 'brush' +Finnish (Suomi) +Turbulent noise driven by the global current frame +Raytraced reflection settings for a Material datablock +Convert effector force into air flow velocity +True when the Shift key is held +Audio Sample Format +Bold +Vertex colors for a face in a Mesh +Cursor +Mouse/Trackpad Pan +Display Paths of poses within specified range +Info space data +Duplicate Armature +Settings for Bullet soft body simulation +Name of the theme +Collection of scene objects +B-Bone Display Z Width +Zoom using up/down on the device (otherwise forward/backward) +Enter Edit Mode automatically after adding a new object +Apply gravitation to point movement +Info on current cache status +Cone +Lock Z Rotation Axis +GLSL Extra Textures +Starts player in a new fullscreen display +Named Group +Samplerate +Children expanded in the user interface +Border +Armatures active bone +Active Path Index +Texture Type +Amount of clumping +Style +Collection of render layers +Show Restriction Columns +Soft Body +Drag effector weight +Layers visible in this 3D View +Top +Quality of the simulation in steps per frame. (higher is better quality but slower) +The constraint is applied in Pose Space, the object transformation is ignored +View Rotation +Gravitation +Cardinal +Dolly +8 bit greyscale binary data +Chroma Vectorscope +Active bone group for this pose +Mesh String Property Layer +Repulsion Factor +Object Constraints +Filter Text +Vertex group to control tangent +Default builtin key configuration +Show folders +Page Down +Elements +Show Actuators +Deletes smoke from simulation +Filter File Extensions +Control point selection status +Left Handle Selected +Draw Stretch +Align rotation with the snapping target +Cloth +Show the name of the view's direction in each 3D View +Display Filter +Object does not restitute collisions, like a ghost +Particle Velocity +Relative time of key over hair length +6 +Threshold for drawing outlines on geometry edges +Lighting +MPEG-4 +Delete +MPEG-2 +Curve Edit +Distance of the physics area +Boid Settings +Pixel resolution of the rendered environment map +Goal maximum, vertex group weights are scaled to match this range +Vertex Group Roughness 2 Negate +Manipulator Rotate +Limits +Current Frame +Project to Self +Sticky texture coordinate location +Transition +Duplicate Texture +Mask +Description of the Function's purpose +Generate voxels from a sequence of image slices +Theme settings for the Node Editor +Automatic time snapping settings for transformations +Banking +Texture Plugin Directory +Mass +Mist settings for a World data-block +Tool Widget Colors +Clip Alpha +Retarget +Drag component proportional to velocity +Enable image painting mode +Blocking +Mirror Colors +Number of frames between ghosts shown (not for 'On Keyframes' Onion-skinning method) +Bars Selected +Use a minimum radial distance for the field's fall-off +Edit Object +Cineon +Height +Texture Factor +Draw Wire +Manipulate object centers only +Custom color set to use +Negate the effect of the density vertex group +SL +Enable Self Collision +Correction +Self Minimum Distance +Keying set paths +Invoke Region Preview +Causes material data to be duplicated with the object +Vertex Group Field +Multiplier to make out-scattered light brighter or darker (non-physically correct) +Object Selected +Keyframe Selected +Pose Bone +Set sensor expanded in the user interface +Theme Audio Window +Strip Time +Number of frames from start frame for influence to fade out +Codec +Speaker +3D Region +Copy Scale +Duplicate Surface +Particle key for hair particle system +Particle Edit +Spaces contained in this area, the first being the active space. NOTE: Useful for example to restore a previously used 3d view space in a certain area to get the old view orientation. +Keep from going through other boids +Output image in DDS format +Orig Height +In Air +Constraint was added in this proxy instance (i.e. did not belong to source Armature) +OpenGL shading language shaders +Render the stamp info text in the rendered image +read only area of the face +Exec Region Channels +Smoke collides with every side +Enable Collision +The mouse button used for selection +How strong a force must be to start effecting a boid on land +Imperial +Vertex Group Length +SDL device - simple direct media layer, recommended for sequencer usage +Pixel Aspect Y +Shadow +ZIP (lossless) +Collection of Compositor Nodes +Viewport Shading +Mean red/green/blue scattering path length +Ball inflating pressure +Snap to nearest marker +Vertical aspect ratio - for anamorphic or non-square pixel output +Window Sliders +Color ramp mapping a scalar value to a color +Make hairs less puffy +Active UV texture index +Location of head end of the bone relative to its parent +Display Texture +Group Node +Collection of meshes +Continue +Grease Pencil Smooth Stroke +Set audio mixing buffer size to 4096 samples +Transparent RGB and alpha pixels are unmodified +Nearest Neighbor +Gives a constant force along the force objects local Z axis +Emit +Bake the normals in tangent space +Active Base +Active UV texture +Falloff Curve +Sun intensity +Collection of related sketches on a particular frame +Vector Fonts +Mesh Edit +String Property +Variables +3D View Space +Show the active object's particle point cache +Cinema 24fps 2048x1080 +The default directory for rendering output, for new scenes +Number of seconds between each run of the GL texture garbage collector +Audio bitrate(kb/s) +Font Size +File +Automatically converts all new tabs into spaces for new and loaded text files +Search again from the start of the file when reaching the end +Driver variable type +Search term for filtering in the UI +If set to True, the panel shows a header, which contains a clickable arrow to collapse the panel and the label (see bl_label). +Subdivision Surface +Simplified Chinese (简体中文) +Edge Length Text +Step Size +All effector's weight +GOP Size +Bottom +Color balance lift (shadows) +True when this value can't be set to None +The color of the lights specular highlight +Free Run (Rec Date) +How much the spring rest length can change after the elastic limit is crossed +Nand +Background Images +Vertex Group Roughness 1 Negate +Follow a boid or assigned object +Collection of Shader Nodes +Show Brush +Save Preview Images +Use Influence +Parameters and Settings for the Filebrowser +Enable direct editing of modifier control cage +Overwrite characters when typing rather than inserting them +Multitexture +Full +Modifier affecting the geometry data of an object +Text to replace selected text with using the replace tool +Particle Age +Unique name used in the code and scripting +Movie Strip +Python Scripts Directory +Global user preferences +Proportional Size +Location of the hair key in object space +Window Manager +Selectable +Diffuse subsurface scattering settings for a Material datablock +Air Personal Space +Which axis to use for offset +Sound +Include Animation Data blocks with no NLA data. (NLA Editor only) +The index of particle system on the target object +Noise algorithm - Voronoi F1-F2 +Autosplit Output +Type of transition used to fade mist +Logic Nand +Enable this OpenGL light in solid draw mode +Explode +Tilt CW +ID-Block +World datablocks. +Rate control: min rate(kb/s) +Alter spring length to shrink/blow up (unit %) 0 to disable +Object is made a particle system to display particles generated by a fluidsim domain object +Alternate script path, matching the default layout with subdirs: startup, addons & modules (requires restart) +channels +Head Select +Nearest Frame +WPaint Auto-Normalize +Active index in render layer array +True when the Cmd key is held +When an 'array/vector' type is chosen (Location, Rotation, Color, etc.), entire array is to be used +Poly +Name of the key map +Roll bones to face the view +Cycle the animated time within the action start & end +Metaball Edit +Use anti-aliasing for the 3D view (may impact redraw performance) +Key Configuration +NLA editor space data +Sounds +Noise formula used for turbulence +Show Thumbnails +Output video in AVI Raw format +Shape Keys +Cloth simulation settings for an object +Transparency along the width of the strand +Name of UV layer to override +Custom animation player executable path +Spring Vertex Group +Goal Damping +French (Française) +tool_settings +3D Cursor +Collection of lattices +Display +Center of mass +The type of radius interpolation for Bezier curves +Global approximate AA and SSS quality factor +Type of data to take texture from +Build +Logic Xor +Backdrop zoom factor +Collection of worlds +Python addons to be loaded automatically +Proxy size 50% +Intensity of the mist effect +UV Editor +Opacity +JPEG 2000 +ID Type +Wires +Texture Face +The default directory to search for sequence plugins +Physics settings for a Material datablock +Size of the turbulence +Plastic +Viscoelastic Springs +Keyframe Insert Needed +Threads Mode +Exclude environment pass from combined +Display an additional 'summary' line. (DopeSheet Editors only) +Blend factor with sky +BMP +Align handle color +Relative friction coefficient in the in the X, Y and Z directions, when anisotropic friction is enabled +7 +Enable naive vertex ball self collision +Text Character Format +Particle System +Active section of the user preferences shown in the user interface +Outliner +Don't use any brush +Pulldown Widget Colors +Duplicate Lamp +Spring rest length (factor of particle radius) +Softens the edges of halos at intersections with other geometry +None +ko_KR +Only Matching F-Curves +Active Particle Target +TIFF +Keyboard +Strand settings for a Material datablock +" +Material Index +Targa Raw +Name that will be used in exported files when format supports such feature +Texture Collection Rate +Blend +Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy +rect +08 - Theme Color Set +Sharp falloff +Proxy Local +Repulsion Distance +Method used for combining strip's result with accumulated result +Particle speed (absolute magnitude of velocity) mapped as 0.0-1.0 intensity +Syntax Numbers +Images get saved in 8 bits grayscale (only PNG, JPEG, TGA, TIF) +Global Space +Save the z-depth per pixel (32 bit unsigned int z-buffer) +The panel label, shows up in the panel header at the right of the triangle used to collapse the panel. +Curving of the noodle +View Type +Children Expanded +Shape +Background Image +Dash +Pass +Snap to Pixels +Engine +Vertex Select +Specular Exclude +Color 2 +Brush strength +Control point weight values +Maximum memory usage in megabytes (0 means unlimited) +Pivot around each object's own origin +Island +Softbody goal weight +Exclude shadow pass from combined +Method for driving added turbulent noise +Sampled colors along line +Offsets the number of the frame to use in the animation +Maximum angular velocity on land (relative to 180 degrees) +Start Frame +Middle Mouse Paste +Edge Seam +Display UV coordinates from 0.0 to 1.0 rather than in pixels +Find Text +Inverse Gamma +Smooth hairs +Graphics driver and operating system settings +passes +Boid rule name +Maximum number of recently opened files to remember +Path to property setting +Level of detail in the added turbulent noise +Screen +Billboard Normal UV +Selects the type of physical representation +Clip End +Creates a force along a curve object +Time delay in 1/10 seconds before automatically opening top level menus +Autosplit output at 2GB boundary +Resolution Y +Artificial buoyancy force in negative gravity direction based on pressure differences inside the fluid +Gamma +Light Cache +Offset +Voronoi F2-F1 +Hair keys are in global coordinate space +Structs +Particle system name +Don't adjust roll +Bevel +UI Layout +Fast but not so effective compression +Use linear workflow - gamma corrected imaging pipeline +Delta +Gravity +Mist uses linear progression +BSpline +Type of element to snap to +Set audio mixing buffer size to 32768 samples +Show the Y axis line in perspective view +Action End Frame +Settings for input devices +Joystick +Left Handle Type +Points U +bl_description +Collection of mesh edges +Screen datablocks. +Object Grouped +Backscattered Light +Active grease pencil layer +Animated Influence +Atmosphere Inscatter +Color of emitted light +Lock Location +Active Vertex Color Layer +Spaces +Properties of particle editing mode +Area height +Collection of armature bones +Resolution U +Click +Filter Files +Display general information +Bone Groups +Overlay +Muted +Movie +Auto Clamped +Individual Origins +Overlap +Custom +Particles +Use Max +Window +File browser space data +AVI JPEG +Editor header containing UI elements. +Object base selection state +Bone Pose +Sequence strip in the sequence editor +Display Background Images +Name to use in scripted expressions/functions. (No spaces or dots are allowed. Also, must not start with a symbol or digit) +User defined layer of floating pointer number values +96 kHz +Occlude +Images are rendered in Image Editor +States +Saturation +Location of this character in the text data (only for text curves) +Users +Scene Objects +Goal Stiffness +Audio Codec +Collection of objects +Type of NLA Strip +Minimum distance to the camera for stars +Main Scenes +Clips to image size and sets exterior pixels as transparent +Interpolation method to use for segment of the curve from this Keyframe until the next Keyframe +Radius from the shaded sample to look for points within +Layer of texture faces in a Mesh datablock +Tangent +Stamp Time +Comb hairs +24-bit Signed +Show Handles +Alpha +Difference +The frequency of the offset (1/total length) +Layer Membership +Render layer +ro_RO +Vector Coordinates +Attenuation falloff strength, the higher, the less influence distant objects have +Flare Boost +Scopes +Description of the item's purpose +Camera Parent Lock +Invert the axis of mouse movement for zooming +Socket name +M +Enable diffuse subsurface scatting effects in a material +Color Factor +Noise algorithm - Cell Noise: Square cell tessallation +For PoseBone paths, use the bone head location when calculating this path +Max Land Speed +Show linked objects to sensor/actuator +Edit drivers +F-Curve Modifier is the one being edited +Channel Matrix +Has Ghost Curves +Resolution % +Noise Method +Object that defines custom draw type for this bone +Still Frame Only +Displays bit depth of full screen display +The name of the active key configuration +Apply sun effect on atmosphere +Spacebar +Limit effectors to this group +Keep paths from intersecting the emitter +Input or output socket of a node +Transform Channel +Storage of a macro operator being executed, or registered after execution +Sets the number of points on the star shaped halo +Display the object's local bounding boxes only +Goal (vertex target position) spring stiffness +Boolean +Cyclic U +Cinema 24fps 4096x2160 +Images are saved with RGB and Alpha data (if supported) +Cyclic V +Indirect +Show Points +Speed +Copy Location +GLSL Lights +resolution_x +All available keying sets +Specular Color +Convert to logarithmic color space +Show keyframes for active Object and/or its selected bones only +Use Visual keying automatically for constrained objects +Game Property +Material Halo +Flare Seed +No Gimbal Lock (default) +Bending Const +Null device - there will be no audio output +Main Fonts +Sensor +Output image in Cineon format +Set audio sample format to 64 bit float +Whether to use maximum clipping value +Display units in pairs +Form factor scales the inertia tensor +Filter Images +Value to use for Ref, Spec, Amb, Emit, Alpha, RayMir, TransLu and Hard +Draw UV edges anti-aliased +Search string is sensitive to uppercase and lowercase letters +Region Text Titles +Flow Settings +Texture Slot +Wrinkle coefficient. (higher = less smaller but more big wrinkles) +Action to take for gaps past the Active Action's range (when evaluating with NLA) +Spring rest length is a factor of 2 * particle size +Mist uses quadratic progression +Base +Enter Edit Mode +Widget Label Style +For Zmask, only render what is behind solid z values instead of in front +Face Angle Text +8 +Face Dot Size +Grow +Strips +Vertex group to control roughness end +Texture Slots +Snap UVs to pixel locations while editing +Border Minimum X +Value +Button5 Mouse +Roll CCW +Deprecation Warnings +Source List Title +Collection of fonts +Effector weights for physics simulation +Indirect Exclude +Input line for the interactive console +; +Soft body +Display Lamp +Tail Select +Rotation in Quaternions +Main MetaBall +Clip objects based on what's visible in other side views +Right Alt +Waveform Mode +Audio samplerate(samples/s) +Random +Harmonic +hr_HR +Themes +Texture scatting blend factor +Selected File +Cache AO results in pixels and interpolate over neighbouring pixels for speedup +double +Negate +Mute this shape key +Fgon +External file packed into the .blend file +Causes text data to be duplicated with the object +Include visualization of Speaker related Animation data +Zoom factor +Tweak Select +Shape Match +Spherical forcefield based on the charge of particles, only influences other charge force fields +Active Boid Rule +Active index in bone groups array +IK stiffness around the X axis +Go to assigned object or loudest assigned signal source +Wait Timer (ms) +The region relative vertical location of the mouse +Mouse/Trackpad Rotate +02 - Theme Color Set +Show Control Curves +Time taken in frames between shutter open and close +Textured Solid +Tail +Lift Force +The type of event, only applies to some +Targets +Main Texts +Draw Axes +Space data type +Subsurface Scattering +Mesh Vertex +Specular Intensity +Smoke collision settings +Cubic +Set all state bits +Action to take for gaps past the strip extents +Neutral +UV mapping, texturing and game engine data for a face +Minimum value for clipping +zh_CN +Wheel Scroll Lines +Shadow color in grey value +The constraint is applied relative to the world coordinate system +Icon File +Theme Console +Step Calculation +Amount the strip contributes to the current result +Shape Key Bezier Point +Smoke doesn't collide with top and bottom sides +Fastest and gives the most noise +Source of input values for driver variables +Show Keyframe Numbers +Image opacity to blend the image against the background color +Outline +window_manager +DDS +Show key map event and property details in the user interface +Bake ambient occlusion +Long List +Manual +Kink +Display Metaball +View Location +Radio Widget Colors +Weights +Cache of the worldspace positions of an element over a frame range +Theme settings for the Text Editor +Number of frames for Blending In/Out is automatically determined from overlapping strips +Collection of Driver F-Curves +Use SIMD QBVH +UV/Image Editor +Use degrees for measuring rotation +Resolution of the voxel grid +Physics Gravity +bl_idname +Name of the key configuration +Keyed particles target is valid +Use force fields when growing hair +Point in the lattice grid +The amplitude of the offset +End Frame +Lets halo receive light and shadows from external objects +Pivot +Permeability +User defined floating point number value in a float properties layer +Render Result +Objects nearer than this are not visible to map +Pivot around active object +Operator Node +Local With Parent +Blender RNA structure definitions +Radius of bounding sphere and material physics +Bezier +Blend Type +Original Perlin +Active UV Texture +Active Object constraint +Armature-Relative Head +F-Curve's settings cannot be edited +7.1 Surround +Fluid Mesh Vertex +Long Key +Do not show any ghosts +Frame for absolute keys +Wav +Preview +[ +ObData +Emulate Numpad +Theme settings for the Timeline +Scrollbar +Clamp velocity to this minimum speed (except when totally still) +Specify old mapping value in frames +Type of texture data to display and edit +Show ghosts for the specified frame range +Radius for bevelling +Copy Rotation +Amount of turbulence/rotation in fluid. +07 - Theme Color Set +Use object/global coordinates for texture +Sequence Element +Use rule when boid is flying +Simplify Shadow Samples +Deliver indirect lighting pass +Window manager datablocks. +Time since last step in seconds +Properties +Y Scale +Minimum Radial Distance +Sampled Points +Theme Logic Editor +Use Stars +Manipulator Translate +Brush steps +Active Pose Marker +F-Modifier +N +True when the Alt/Option key is held +Decimate +Use multi-sampled 3D scene motion blur +Type of active data to display and edit +Permanent deform +Onion Skinning Settings +Defines where the color of the environment light comes from +Theme settings for bone color sets +Scopes for statistical view of an image +Push +Show Seconds +Logic Or +Buffer Resolution +Create a toon outline around the edges of geometry +Regions +Damped Track +Active Bone Group Index +Automatically select acceleration structure +Specify a collision bounds type other than the default +Auto-Clamped handle color +Vertex Group Roughness End +Sets the maximum number of logic frame per game frame if graphics slows down the game, higher value allows better synchronization with physics +Control Point +Particle count +Turntable +Use Weight Color Range +Octree +Environment Exclude +Fuzziness while on collision, high values make collision handling faster but less stable +Tweak +Marker +Shadeless +Mist +Scene Render Layer +Sequence editing data for a Scene datablock +Friction Coefficients +Structural Stiffness Vertex Group +Meta Stack +Duplicate F-Curve +Show sound files +Render layer name +Index of active particle system slot +Roll bone to original joint plane offset +Filter Fonts +Material Subsurface Scattering +Tip +Invalid +Show Cache +Delay +Blend factor for SSS colors +Fluid Group +Causes F-curve data to be duplicated with the object +Stationary object +el_GR +Compression method to be used +B-Bone Ease In +Relative Paths +Mesh Int Property Layer +Enable smoke to disappear over time +Double Click Timeout +Cell Noise +Particle system has multiple point caches +Human readable name +The object that has the target particle system (empty if same object) +Maximum acceleration on land (relative to maximum speed) +Legacy +Clip alpha below this threshold in the 3D textured view +IK rot control +Force gets absorbed by collision objects +9 +Noise method which is used for creating the high resolution +Manipulator +Select UVs that are at the same location and share a mesh vertex +Shadow offset in pixels +Bake directly from multires object +Insert +Wind effector weight +DopeSheet Editor +Entire Array +Use smoke heat as texture data. Values from -2.0 to 2.0 are used +Sequence Color Balance +Disallow movement around the X axis +Scenes +Active KeyConfig +Distance between two bones or objects +Rate control: max rate(kb/s) +Active file in the file browser +Limit collisions to this group +Nurbs weight +Outline Selected +Extrapolate the curve or extend it horizontally +Right Handle +Collection of mesh vertices +Smooth the final stroke +Current Transform Orientation +F-Curve live filtering string +Softness of the 'soft' falloff option +Selection Mode +Proportional Editing +Collection of keying set paths +Build 25% proxy resolution +DBVT culling +Armature Edit +Show Datablock Filters +A valid edit mode exists +World Mist +Default Value +Full Screen +Text in the line +Quality +A container referencing an existing Action +Layer name +Auto Start +Show column +Show text files +Draw faces colored according to the difference in shape between UVs and their 3D coordinates (blue for low distortion, red for high distortion) +Snap Align Rotation +Angle of Rotation for Axis-Angle rotation representation +192 kHz +From socket +Nurb active U-lines +Constraints that act on this PoseChannel +Cyclic Strip Time +Space Outliner +Constraint has valid settings and can be evaluated +Debug +Pose Bones +Show image files +Goal maximum, vertex weights are scaled to match this range +Puff +Right Handle Type +Include the name of the active cameras lens in image metadata +Sky Color Space +Include visualization of Armature related Animation data +Character Index +Pin (vertex target position) spring stiffness +Open source frame player: http://djv.sourceforge.net +Grab Pointer +Bone is not able to be transformed when in Edit Mode +Show linked objects to the controller +Blend Distance +Edited +The mode used to apply the texture +Locked Track +File Browser +Vertex weight group, to blend with basis shape +The type of keyframe (for visual purposes only +Drawing method used by the window manager +Active Particle Target Index +Front +Enable starfield generation +Show an outline highlight around selected objects in non-wireframe views +Zooms in and out based on vertical mouse movement +Calculate sub-surface scattering in materials rendering +ar_EG +Include the render frame as HH:MM:SS.FF in image metadata +Line of text in a Text datablock +Mipmaps +Active Theme Area +Theme Widget Color Set +Boid height relative to particle size +Using 1/x +Scene keying sets +Show Sliders +All Z +Environment Color +Position +Buffersize +Adapt To Speed +Or +Display and edit the grease pencil freehand annotations overlay +Effect Strip +Group of ID properties +Duplicate Material +Vertex Paint +Hair Dynamics +Stroke Points +NLA Track is locked +Which mesh elements selection works on +Weight of rotation constraint for IK +Always refresh image on frame changes +Use horizon and zenith color for diffuse energy +Extra margin around object for collision detection, small amount required for stability +Collection of vertex groups +Coordinates of the first handle +Sky Blend Mode +Mesh Edge +Disallow movement around the Y axis +Color balance gain (highlights) +Normal Space +Layers +Spin CW +Mesh Float Property Layer +Buffer Resolution - decrease it to increase speed +12 bit color channels +Space Graph Editor +Directory Path +False when this property is an optional argument in an RNA function +Framing Types +Display Paths of poses within a fixed number of frames around the current frame +Last selected point +Cropping parameters for a sequence strip +Min Air Speed +Wavelet +Color used for the surface of bones +Window Managers +Occlude objects with the environment color as they are further away +Driven Selected +Surface Edit +Causes metaball data to be duplicated with the object +Main Curves +Japanese (日本語) +Vertex Group Field Negate +Collection of uv textures +Enable simplification of scene for quicker preview renders +String +Randomized +Retarget template bone chain to stroke +Use the manipulator for movement transformations +Command line prompt language +How the rules in the list are evaluated +Color of texture overlay +Text Box +Modifier for values of F-Curve +Specify the number of cluster iterations +Mass of the object +React to force field physics settings in materials +The window relative vertical location of the mouse +YCbCr (ITU 709) +Linear viscosity +8x +Nothing +IK Z Limit +Sensors +Child Seed +Tweak Middle +Object represents a volume of fluid in the simulation +Property is editable through RNA +Theme settings for the Console +Datablock from which the edited datablock is linked +Particle +Solo +Mark controller for execution before all non-marked controllers (good for startup scripts) +FFMpeg audio codec to use +ZTransp +Location (Object Space) +Armature datablocks. +IK Z Lock +Display size for normals in the 3D view +Original IK solver +Use velocities for automagic step sizes +Type of range to show for Motion Paths +For RGB curves, the color that white is mapped to +Noise algorithm - Voronoi F1: Returns distance to the closest feature point +IK Y Minimum +Pin Stiffness +Cache Info +Domain +Only include F-Curves with names containing search text +Nurbs order in the V direction (For surfaces only), Higher values let points influence a greater area +Spanish (Español) +Sets the dimension of the halo +Vertex in a Mesh datablock +Line Numbers Background +Shadow Size +Depth +Rest Density +Frame Server +alert +Meta Element +Show actuators of all selected objects +Calculate environment maps while rendering +Motion Path Settings +Interlaced +Space type +Display the operator log +Show background image in front view +Goal Vertex Group +Storage of a sub operator in a macro after it has been added +Collision Bounds +Maximum value for clipping +Transparency +Armature-Relative Tail +Is this keymap item user defined (doesn't just replace a builtin item) +FFMpeg codec to use +Show frame numbers on Motion Paths +Maximum allowed number of light inter-refractions +Use a third buffer for minimal redraws at the cost of more memory +Game engine logic brick to process events, connecting sensors to actuators +Layer in multilayer image +Depth Cutoff +Mesh Edges +Sequence strip data for a single frame +The number of lines scrolled at a time with the mouse wheel +Root Texture Coordinates +Tag Seam +Visibility status +Birth Time +Mini Axis Brightness +Environment +Accuracy +Driven +Air Damping +Use Vertex Buffer Objects (or Vertex Arrays, if unsupported) for viewport rendering +Normal +Keys +The axis icon's size +Spring Force +Brushes +Drag +Emulate 3 Button Mouse +Sculpt/Paint Overlay Color +Collection of keymap items +Shadow Y Offset +Fuzzy +Comb +Theme settings for the User Preferences +End frame of the stored range +Grid Subdivisions +Layers bone exists in +Base type for datablocks, defining a unique name, linking from other libraries and garbage collection +Numpad 5 +face area +Clip Start +Numpad 2 +Tweak Action +Shape Key datablocks. +GL Texture Limit +Only keyframes of selected F-Curves are visible and editable +Numpad 9 +Crease +Filter +Minimum angles for IK Limit +Scatter contribution factor +Bones which are children of this bone +Main Particle Settings +Collection of particle settings +Use modifier during rendering +Numpad / +Numpad . +05 - Theme Color Set +Read Only +Include visualization of Particle related Animation data +Numpad * +Bone is not visible when in Edit Mode +Width Fade +Amount of rotation around velocity vector on turns +Czech (Český) +Display datablocks in all scenes +Turbulent noise driven by the particle's age between birth and death +Aerodynamics Type +Best quality +Use effector/global coordinates for turbulence +Target particle systems +Min Rate +Distance to keep particles away from the emitter +Type of information to display +Limit movement around the Z axis +NLA stack is evaluated when evaluating this block +Apply puff to unselected end-points, (helps maintain hair volume when puffing root) +Fgon edge +Perspective +Bone rotation around head-tail axis +Pan/Zoom +Speaker datablocks. +Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking +No Auto-Snap +Active Texture Face +Node Backdrop +Count +Amount of influence F-Curve Modifier will have when not fading in/out +Collection of points that make up this poly or nurbs spline +Enable All Codecs +Auto Blend In/Out +Show Python Tooltips +Show menus in the header +Actuators +Edit texture nodes from World +Cross +Particle target name +Frame Map Old +Collection of channel driver Variables +Lower First +Stamp Render Time +Groups of the bones +Vertex Group Velocity +Cine-Flat 48fps 1998x1080 +Snap +Extreme Alpha +2x +UV Selection Mode +Overall sensitivity of the 3D Mouse +Images are rendered in full Screen +Activity culling is enabled +2D cursor location for this view +Metaball types +F +Show Linked to Actuator +Square (HS + V) +Node Groups +Name Property +Dither Intensity +Reconstruction filter used for combining anti-aliasing samples +Minimal +Active Face +Scripts +Image Axis +Orig Width +Pose Head Position +Cursor Y-Value +Property is optionally registered as part of type registration +IK stiffness around the Z axis +NLA Tracks +Constrain to Image Bounds +Arrangement of the panels +Length of second Bezier Handle (for B-Bones only) +Median +AO +Node in a node tree +Cast +Save cache files to disk (.blend file must be saved first) +Simplify AO and SSS +Use key times +de_DE +Property has been dynamically created at runtime +Ball Size +Display sequence datablocks +Read-only matrix calculated from the roll (armature space) +Noise algorithm - Improved Perlin: Smooth interpolated noise +Automatically start game at load time +Generate point density from a particle system +How much of effector force gets lost during collision with this object (in percent) +Deliver AO pass +Group that included Object should be a member of +Shear Stiffness +Material Volume +The rotation step for numerical pad keys (2 4 6 8) +Include visualization of Mesh related Animation data +Maximum acceleration in air (relative to maximum speed) +Pin ID +Radar +Render color of textured face as color +Parts Y +Parts X +Collection of F-Curve Modifiers +Time since last access of a GL texture in seconds after which it is freed. (Set to 0 to keep textures allocated.) +Theme Image Editor +Graph Editor 2D-Value cursor - Y-Value component +Automatically merge vertices moved to the same location +Stencil +Lock strip so that it can't be transformed +Vertex Group Rotation +Djv +Use a quadratic filter for anti-aliasing +Calculates environment map only once +Node Links +The number of subdivisions between grid lines +Filter Folder +use images in the order as they are recorded +Collection of libraries +Use selection as the pivot point +Auto Snap +The original matrix of this object before it was duplicated +The unit system to use for button display +Limit selection to visible (clipped with depth buffer) +Type of field +float_array +Root falloff +The quality of the anisotropic filtering (values greater than 1.0 enable anisotropic filtering) +Dodge +Active Vertex Group Index +Method used for determining what ghosts get drawn +Proportional Editing Objects +Parent +Particle dupliobject name +Theme Widget State Color +Tilt CCW +Mirror Intensity +Object +Include visualization of Lamp related Animation data +Object Location +select_end +FrameCycler +Joint +Backdrop X +Backdrop Y +Use Instances +Y Rotation +Nor +Addon +Anti-Aliasing Samples +frames_skipped +Stamp Lens +Make hairs more puffy +Offsets image horizontally from the view center +Negate the effect of the roughness 2 vertex group +Invoke Screen +A square showing Hue/Saturation, with Value slider +3D cursor location for this view (dependent on local view setting) +The color that rays with no intersection within the Max Distance take. Material color can be best for indoor scenes, sky color for outdoor +Outer Thickness +Format of Time Codes displayed when not displaying timing in terms of frames +Display Node +Boid will fight this times stronger enemy +Custom Color +P +Negate the effect of the rotation vertex group +Select Tail +Settings for boid physics +Options for this operator type +Mouse Y Position +Input properties of an Operator +Fixed +Current windowmanager and data context +Curve interpolation at this point: Bezier or vector +Collection of actions +Tab Width +Theme 3D View +Render +Auto Keyframe Insert Available +Grid Scale +Number of undo steps available (smaller values conserve memory) +Show background image in bottom view +Theme Graph Editor +Surface +Flash +Collision +Grid Lines +Pre Roll +Strand +The transformation of the target bone is evaluated relative its local coordinate system, with the parent transformation added +Disables non-planer quads being triangulated +Smoke doesn't collide with any border +Ghost frames on either side of frame +Root Size +Select +ID-Block representing source data, currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) +Index +Functions +03 - Theme Color Set +Built-In Function +Display objects name and frame number in 3D view +Custom text to appear in the stamp note +Cameras +Noise algorithm - Voronoi F4: Returns distance to the 4th closest feature point +Estimated scale matrix +Overall stiffness of structure +State +Camera +Distance between key frames +Image Painting +Object is made a fluid control mesh, which influences the fluid +Draw image with RGB colors +Build 100% proxy resolution +Space Type +Transformation +Method of calculating the steps through the volume +Material slot name +Number of frames between cached frames +Repulsion is a factor of stiffness +Edge spring friction +Face Area Text +Frame Map New +Media Play/Pause +Mux Rate +Show background image in all views +Slider Max +Every Point +Stub RNA type used for pointers to unknown or internal data +Number of indirect diffuse light bounces +Clip Min X +Clip Min Y +Link +Record animation to fcurves +Object removes fluid from the simulation +The number of times this object is repeated with respect to other objects +Line +Method used to define which Group-name to use +Use Material Force Field +Multi constraint, stateful IK solver +Texture nodes +Locked +Filebrowser Parameter +Path to an image editor +Weights for the vertex groups this point is member of +Insert keyframes based on 'visual transforms' +Armatures +Nabla +Mesh String Property +Collection of action groups +Keep path lengths constant +The type of tilt interpolation for 3D, Bezier curves +Creates a force that dampens motion +Disable simulation of linear motion along the Y axis +Green +Layer is selected for editing in the DopeSheet +Voronoi F2 +Voronoi F3 +Active F-Curve Modifier +Cycles +Margin +Voronoi F4 +Theme settings for the Image Editor +Face Dot Selected +Damping of cloth velocity. (higher = more smooth, less jiggling) +GLSL Color Management +Prompt +Length of first Bezier Handle (for B-Bones only) +Theme settings for style sets +Ctrl +Show intermediate values for the driver calculations to allow debugging of drivers +F-Curve is not evaluated +Vertex indices +Lens angle (mm) in perspective view +Back +German (Deutsch) +Color of light scattered out of the volume (does not affect transmission) +Build free run time code index +Extrapolation +Theme settings for Info +Collection of metaball elements +Use face normal to rotate object, so that it points away from the surface +Lens +Otherwise menus, etc will always be top to bottom, left to right, no matter opening direction +Particle Dupliobject Weight +Use textures for drawing international fonts +Use light for face +The edge flag to tag when selecting the shortest path +Vinterlace +Cycle the images in the movie +Display Z Axis +Reflectivity +Window Draw Method +Set audio sampling rate to 44100 samples per second +Causes particle systems to be duplicated with the object +Scripts Window +Boolean Property +SMPTE (Compact) +Automatically merge nearby keyframes +Fast in high-contrast areas +YCC +Deliver object index pass +Bake shadows +Continuous Grab +Alive State +Input +Adaptive +Single texture face materials +Color Ramp Element +Hue +Error tolerance (low values are slower and higher quality) +Transforms include effects of constraints but not parenting/restpose +Collision Settings +Collection of cameras +Command line prompt +Cache file path +Object Space +Driver +End size of strands in pixels or Blender units +Weighted result of strip is added to the accumulated results +NLA Track is selected +Quaternion +DOC BROKEN +19 - Theme Color Set +Debug State +Active Keying Set used to insert/delete keyframes +Lock Rotations (4D) +Sets the audio output device +Channels to display when drawing the histogram +Sky Blend +Reflection +Vertex group to control roughness 1 +Bake Emit values (glow) +Language use for translation +Atmosphere Distance Factor +Emit Object Space +Motion Path Points +Z-Buffer +IK Solver +F-Curves +Semantic interpretation of the property +Partial overlay on top of the sequencer +Unborn +Effect in full or only positive/negative Z direction +Format of the source data set to render +Space UV Editor +Solid Lights +F1 +F2 +F3 +F4 +F5 +F6 +F7 +Fonts Directory +Single ASCII character for this event +Frame +Allow boids to move in air +Zoom Style +Library +Sky related settings for a sun lamp +Inherit Rotation +Disable Stereo and Dome environments +KeyConfigs +IK Stretch +Voronoi F1 +Rigid Body +operator_context +Rotation Units +Apply this and all preceding deformation modifiers on splines' points rather than on filled curve/surface +idp_array +XYZ velocity mapped to RGB colors +Editmode +Particle Location +Tabs as Spaces +Region Background +Render Layers +Stiff viscosity +Scale Matrix +Pinned +Sequence Editor +Vertex Normal +Display current image regardless of object selection +Display Lattices +Density +Exclude raytraced refraction pass from combined +Charge effector weight +Limit colliders to this Group +Draw Repeated +Space currently being displayed in this area +Show frame number beside the current frame indicator line +Face +Normalized quaternion rotation +Proportional Editing enabled +Vector handle selected color +Scope region background color +Show font files +Wave +Stickness +Vertex Groups +The time to animate the view in milliseconds, zero to disable +Number of times this datablock is referenced +Source Path +Forcefield based on a texture +Lattices +Object used as the smoke simulation domain +Parameters defining which layer, pass and frame of the image is displayed +Vertex Size +Italian (Italiano) +Physics Type +Ghost +Audio Device +Display Scene +Limit Scale +Enable Dome environment +Vertex Group Kink Negate +Radial Falloff Power +Value Sliders +collection +Meta Elements +Q +Display Transforms +Texture Time Out +Output image in TIFF format +Key Map +Particle systems emitted from the object +Fade effect using the built-in default (usually make transition as long as effect strip) +Include visualization of ShapeKey related Animation data +Manual adjust +Space User Preferences +NLA Track is not evaluated +Use rule when boid is on land +Anisotropic Filter +Red Green Blue +Radiance HDR +Active object base in the scene +User defined layer of integer number values +Texts +Sort the file list by extension +Settings for filtering animation data +Number of horizontal pixels in the screen +Path to the .blend file +Converts texture RGB values to intensity (gray) values +Different styles of displaying the color picker widget +Initial state when the game starts +Nurbs order in the U direction (For splines and surfaces), Higher values let points influence a greater area +Show sliders beside F-Curve channels +Fisheye +Show View Name +Sequencer and Image Preview +Fake User +Video Sequence Editor +Struct Definition +The directory for storing temporary save files +Record Animation +F-Curve Modifier will not be evaluated +Full Render +Only one side is rendered, with Z axis pointing in direction of image +Show ghosts from around the current frame +Display Channel +Automatically switch between orthographic and perspective when changing from top/front/side views +Print debug information for this property +Update simulation with cache steps +Relationship Lines +RNA Path to property affected by F-Curve +Median Point +Vertex Group Clump Negate +Sets angular index of refraction for raytraced refraction +Node Socket type +Outliner space data +Shadow X Offset +Amount of residual error in Blender space unit for constraints that work on position +Make diffuse shading more similar to shading the surface +Scale textures for the 3D View (looks nicer but uses more memory and slows image reloading) +Draw white edges with black outline +UV selection and display mode +No +Show linked objects to the actuator +Key Config +Pressure +Render Data +Quaternion Rotation +Multiply +Control point for envelope F-Modifier +Proportion of original image source pixel lines to sample +Avoid Collision +Snap to volume +Starting frame of range of Ghosts to display (not for 'Around Current Frame' Onion-skinning method) +Automatically determine the number of threads, based on CPUs +Curve mapping to map color, vector and scalar values to other values using a user defined curve +Run python while editing +Selects the collision type +Active Vert/Edge/Face +Tessellation level - check the generated mesh in wireframe mode +Register +Transform Markers +Include visualization of Scene related Animation data +Index number of cache files +Text Highlight +Halo particle effect settings for a Material datablock +MPlayer +Previous Particle Location +Recent Files +Legacy tracking constraint prone to twisting artifacts +Edges receive a lift force when passing through surrounding media +Optional region type keymap is associated with +Output image in JPEG 2000 format +Self Collision +Enable bending constraints +Theme DopeSheet +Layer +Drag Threshold +Factor Rest Length +Which style to use for viewport scaling +Data to derive color results from +Lattice datablocks. +Nested +MultiLayer +Display Curve +Disk Cache +Transform markers as well as strips +mode +Target object for multi-target constraints +Multiplier for the material's density +FPS Base +Grease Pencil Simplify Stroke +Edit all markers of the same group as one +Harmonic effector weight +Location of head end of the bone relative to armature +Texture coordinates from root particle locations +Stereo Options +Disallow movement around the Z axis +Number of vertical tiles to use while rendering +Random Friction +Specifies an offset in the flare seed table +Horizon brightness +Language +Sound Clip +Light used for OpenGL lighting in solid draw mode +Instead of per brush radius, the radius is shared across brushes +NLA Editor +Vertex group to control velocity +input_count +Only hold last frame +Elasticity of collisions +Sky Texture +Use SIMD SVBVH +Sort alphabetically +New Handles Type +Display only objects which will be rendered +Noise +The time (in ms) for a double click +matrix +channel_id +Only render the active layer +Material +No TC in use +Output image in multilayer OpenEXR format +Empty +Always +Enable filtering of files +Template +When the camera is locked to the view and in fly mode, transform the parent rather than the camera +Show Sensors +Auto handle color +Custom Warp Mesh data file +Audio Channels +Available as GameObject attributes in the game engine's python API +Offset Y +Offset X +Pre-calculate the raytrace accelerator and render raytracing effects +For multires, show low resolution while navigating the view +Active curve spline +Strength of sky shading exponential exposure correction +Print Performance to Console +Power of Fresnel for mirror reflection +Default binary voxel file format +Copy Transforms +Draw alpha transparency channel +4x4 bone matrix relative to armature +Edge spring stiffness when longer than rest length +When true the format is a movie +Read cache from an external location +Object Index +Print warnings when using deprecated features in the python API +Library datablocks. +Option Widget Colors +Auto Depth +Goal Minimum +Display size for proportional editing circle +Point +NLA Strip +Strokes +Proxy size 75% +Lock editing of scale in the interface +Sensor name +Point in a shape key +Dutch (Nederlandse taal) +Only Objects in Group +Method used to adjust the roll of bones when retargeting +Default relative path option for the file selector +Proportional editing object mode +Sampled animation data +Output image in PNG format +Owner Space +Align the transformation axes to the selected objects' local space +If this is set, the panel gets a custom ID, otherwise it takes the name of the class used to define the panel. For example, if the class name is "OBJECT_PT_hello", and bl_idname is not set by the script, then bl_idname = "OBJECT_PT_hello" +Lock Rotation (4D Angle) +Overdraw Sketching +Pause +Maximum speed in air +Backdrop Y offset +Ellipsoid +Object is a fixed obstacle +scene +Load user interface setup when loading .blend files +'Viscosity' inside collision target +Bake everything +Lamp +Negate the effect of the length vertex group +Material nodes +Particle system has been edited in particle mode +Shadow size in pixels (0, 3 and 5 supported) +Collection of timeline markers +Local +Old style zoom, continues while moving mouse up or down +Tooltips +Edge Collision +Fluid rest density +Blender Voxel +Bezier curve point with two handles +Runtime +Regular key pressed as a modifier +UV Layer +Initial Velocity +Sources of input data for evaluating this variable +Timeline +Game engine related settings for the object +Hide Recent Locations +Include the name of the active camera in image metadata +Colored Constraints +Particle Hair Key +Y Location +Exec Region Window +Stereographic techniques +UV editor settings +General movement damping +Estimate matrix +Global Pivot +IK X Lock +Show the active object's softbody point cache +Vector Handle +Number of frames from start frame for influence to take effect +int_array +Key velocity +Negate the effect of the roughness 1 vertex group +Output Path +Image User +AutoMerge Editing +Flare Subsize +Handle 2 Location +Edge UV Face Select +Clamp To +NDOF +The transformation of the target is only evaluated in the Pose Space, the target armature object transformation is ignored +Wheel Up +Linear falloff +Show the status of cached frames in the timeline +R +Keyframe +Blender Render +Noise Basis +How the texture effect is calculated (RGB & Curl need a RGB texture else Gradient will be used instead) +Display Grid Floor +Transmission Color +Parameters defining how an Image datablock is used by another datablock +Spline point without handles +8 bit color channels +Collapse summary when shown, so all other channels get hidden. (DopeSheet Editors Only) +Draw Z-buffer associated with image (mapped from camera clip start to end) +Filter Size +Density is constant within lookup radius +Clear Images before baking +Snap closest point onto target +Cloth Collision Settings +Sequence Plugin Directory +Size of widget handles as percentage of widget radius +Friction +Main Speakers +Offset in the random number table, to get a different randomized result +Keep Lengths +Vertex Group Element +Snap to faces +Case Sensitive Matches Only +Time delay in 1/10 seconds before automatically opening sub level menus +RNA structure definition +F-Curve Modifier is only applied for the specified frame range to help mask off effects in order to chain them +Collection of pose bone constraints +Angle +Gives a spiraling force that twists the force objects local Z axis +AAC +The constraint is applied relative to the local coordinate sytem of the object +Separate color channels in preview +Absolute Density +Target Particle System +When transforming keyframes, changes to the animation data are flushed to other views +Amount of pixels you have to drag before dragging UI items happens +Manipulator Hotspot +Nurb U-lines +Output video in Ogg format +double_array +Shape matching threshold +Drag component proportional to the square of velocity +Inner Selected +Show Playback FPS +Interpolation +Space File Browser +Hold LMB Open Toolbox Delay +Vertex Group Weight +Timeline editor space data +Main Screens +Improved Perlin +The value this event translates to in a modal keymap +Theme settings for widget state colors +Reversed +Mesh Float Property +Sky Exposure +Align each axis to the Euler rotation axis as used for input +Show Frame Numbers +Action Editor +17 - Theme Color Set +Soft body simulation settings for an object +Mesh Vertices +32-bit Float +Invisible +Number of horizontal pixels in the rendered image += +Handle types +Stricky texture coordinate +Max Land Angular Velocity +Struct definition used for properties assigned to this item +RGB to Intensity +Operator +Mapping settings +Name of Shape Key +Shadow Alpha +Radius Interpolation +Pulse True Level +Bounces +Exec Region Preview +Edge Draw Type +Color Management +Raytrace +Forcefield depends on the speed of the particles +Mode +Stiffness +Radial +Display World +Gravitational constant used for physics simulation in the game engine +Logic Editor +Text Selected +Point Caches +No compression +Vertex coordinates are stored localy on each primitive. Increases memory usage, but may have impact on speed +Edge Crease +Sets the hardness of the halo +Use Ambient Occlusion to add shadowing based on distance between objects +Frame that modifier's influence starts (if Restrict Frame Range is in use) +active_strip +Lock +Collection of window managers +Cine-Flat 24fps 1998x1080 +Sort by extension +All Views +Enum Item Definition +Button 4 +Button 5 +Button 6 +Button 7 +Button 1 +Button 2 +Maximum angles for IK Limit +Render Pass +Selected Text +Data Path +Enum Flag +Soft Light +Define forces for vertices to stick to animated position +Sample every pixel of the image +The default directory to search for loading fonts +Goal +Dissolve Speed +Textbox X Offset +Sky turbidity +Gamma Corrected Color +OpenAL device - supports 3D audio, recommended for game engine usage +Console Input +Invert the level(output) of this sensor +Memory Cache Limit +Point Cache List +Motion Path settings for visualisation +Endpoint V +Linear and angular physics +NLA Strip is selected +The channel number shown in the image preview. 0 is the result of all strips combined +Shrink +Limit movement around the X axis +Draw Action +Display debug reporting info +Collection of action fcurves +Bone inherits scaling from parent bone +Lock current frame displayed by layer +Selects which domain border will be treated as collision object. +Type of stretch to draw +Friction/damping with self contact +Undo +ZYX Euler +Scaling factor for the background image +vBVH +Bone deformation weight (for Envelope deform only) +Interaction radius is a factor of 4 * particle size +Shape key to use the rest spring lengths from +Use this texture as a blending value on the next texture +Particle datablocks. +Show Python references in tooltips +Theme NLA Editor +Above-Below +Transition Strip +NLA Strips on this NLA-track +Draw black edges +Use Game Engine +Light Override +Current frame number can be manually set to a negative value +Only include channels from Objects in the specified Group +Compositing +128 +Random Damping +Effector Weights +Location of tail of the channel's bone +Frame Number +Image displayed and edited in this space +Vertex group to control roughness 2 +Show background image in camera view +How incompressible the fluid is +Point select mode +Panel containing UI elements +Stamp Date +Inverts the values of the texture to reverse its effect +Smoke flow settings +Active Particle System +Channels +Type of this region +Intensity +Audio Strip +Blending +Enable this objects as a collider for physics systems +Tracking along a single axis +Weight used by the Subsurf modifier for creasing +Duplicate Mesh +Keying Set Info +Map Type +Use BLI K-Dop BVH.c +Add light and shadow +Random falloff +Script +Edge selection mode +Auto Handle +Collection of bone groups +Vertex Group Roughness 1 +Sets minimum X value to for the render border +Coordinates of the left handle (before the control point) +Source +Output Node +Groups of Pose Channels (Bones) +Hide recent locations in the file selector +Particle editing brush +Show the ground plane grid in perspective view +Snap Target +Scripted Expression +Shadow Brightness +Noise algorithm - Blender original: Smooth interpolated noise +Rot error +Amount of damping during particle collision +Save Versions +Anti-aliasing +Endpoint U +Sub-Target +Settings +Use international fonts +Show Mini Axis +Previous Particle Velocity +Edge in a Mesh datablock +Function Definition +Softbody +Theme settings for the DopeSheet +Deliver specular pass +Add the file format extensions to the rendered file name (eg: filename + .jpg) +Collection of KeyConfigs +Active Element +Wipe +Deliver raytraced reflection pass +Fade paths and keys further away from current frame +Threshold for adaptive sampling. If a sample contributes less than this amount (as a percentage), sampling is stopped +Control point spring strength values +Extends by repeating edge pixels of the image +File is Saved +Region Type +OpenEXR +Auto Keying +S +Vector +Texture Mapping +Cache name +Smoke +Boid State +Space Node Editor +Multiresolution +No Preset +Maximum allowed number of light inter-reflections +Final key configuration that combines keymaps from the active and addon configurations, and can be edited by the user +Allow Negative Frames +Bending +Group to override all other lights in this render layer +Position solver iterations +Exists +Lock editing of 'angle' component of four-component rotations in the interface +Deliver shade-less color pass +Rear-Truncated +RNA +Has Minimum +Strip has no influence past its extents +Lennard-Jones effector weight +Screens +Window Background +current_character +Meta +Action datablocks. +Floating-Point Property +Structural Stiffness +Particle system settings +Codec settings for OpenEXR +Axis +Forces the current Scene to be displayed in all Screens +Indicates that a keymap is used for translate modal events for an operator +Environment map created by the renderer and cached for subsequent renders +Rotational Difference +Use shaders for GLSL rendering +Multiple Springs +Emitter Distance +Edit Bone +Indicates that a keyconfig was defined by the user +Include channels from objects/bone that aren't visible +Align dynamic game objects along the surface normal, when inside the physics distance area +Frames Per Second +Set the distance between the eyes - the camera focal length/30 should be fine +Draw Other Objects +Mouse Previous Y Position +Flare Size +Maintain Volume +Display mode for the file list +Max Step +Activate FALSE level triggering (pulse mode) +Active Render +Size Y +Size X +Display splash screen on startup +Size Z +Grease Pencil Layer +X/Y coordinates of the curve point +Use a minimum distance for the field's fall-off +Show 2D cursor +Frame Locked +Active +Horizontal +Editing +Factor for how much surrounding objects contribute to light +Blend In +Sets the global starting frame of the movie/sequence, assuming first picture has a #1 +bg_BG +The size of the occlusion buffer in pixel, use higher value for better precision (slower) +Horizontal aspect ratio - for anamorphic or non-square pixel output +4x4 matrix, before constraints +Minimum Distance +End frame of range of Ghosts to display (not for 'Around Current Frame' Onion-skinning method) +Particles generated by the particle system +Region Text Highlight +Align +zh_TW +Overwrite existing files while rendering +Cylinder +How many frames to fade +Driver type +World +Theme settings for user interface elements +Bending Stiffness +Draw other selected objects that share the same image +Show dashed lines indicating parent or constraint relationships +And +Bevel Radius +Extrapolated +Force +Active Brush +Distance will be used to attenuate shadows +Form Factor +The space where the header is going to be used in. +Number +Shade Top +Number of frames to render ahead during playback +Current view matrix of the 3D region +Handle 1 Location +Vertex Group Density +Active Frame +IK Y Limit +Blending to inelastic collision +Enable high resolution (using amplification) +Simulation starts on this frame +Properties to set when the operator is called +Result of rendering, including all layers and passes +iTaSC +Sound datablocks. +Tweak Left +X Scale +Bone in an Armature datablock +Output image in Targa format +Stamp Sequence Strip +F-Curve Modifier's panel is expanded in UI +Build 50% proxy resolution +An object duplicate +Start Offset +Items +Fluid simulation settings for an object taking part in the simulation +Set audio mixing buffer size to 8192 samples +Material Strand +Inflow +Sort +Relative Key +Motion Paths +Return +Stiffness defines how much of the element to fill +Meta Strip +Bake Alpha values (transparency) +Memory cache limit in sequencer (megabytes) +Input configuration, including keymaps +Select the type of Framing you want +Animation data for this datablock +Raytracing +Key Map Item +Split quads to give the least distortion while baking +Show overexposed areas with zebra stripes +1024 +Bias towards faces further away from the object (in blender units) +Strip time is controlled by an F-Curve rather than automatically determined +Bake Location +sr_RS +Panel +Main Libraries +Edit Edit +Get away from assigned object or loudest assigned signal source +Darken +Script datablocks (DEPRECATED). +Average Separation +F-Curve Modifiers +RNA type used for pointers to any possible data +Space Image Editor +UV Selected +Handle 1 Type +Choke +Use Simplify +Maximum +YZX Euler +No Self +Helicopter Mode +Rotation in Eulers +On Cage +Bone that defines the display transform of this custom shape +Main Node Trees +Used Layers +Cube Map +Point cache for physics simulations +Interactive python console +Use environment map with six cube sides +Grease Pencil datablocks. +Show .blend files +Kill Particles +Sets maximum X value for the render border +Only Seconds +NLA Tracks (i.e. Animation Layers) +Timer Property +Z Rotation +Ensure all bone-deforming vertex groups add up to 1.0 while weight painting +Rigid to Soft Body +Lock to Object +Threshold +Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible) +Occlude Geometry +Causes surface data to be duplicated with the object +Use the images alpha values clipped with no blending (binary alpha) +Hold Forward +Set Controller state index (1 to 30) +Amount of light that gets scattered out by the volume - the more out-scattering, the shallower the light will penetrate +Lock Horizon +Ignore Layers +Object Matrix +Pixel Aspect X +Filename +Use Ambient Occlusion +The transformation of the target is evaluated relative to its local coordinate system +BW +Bake Specular values +Tool +Margin Column +Maximum distance from active object to other object (in blender units +Final transformation value of object or bone +Group Name +fr_FR +Kill collided particles +Disable simulation of angular motion along the Y axis +Collision Margin +SMPTE timecode showing minutes, seconds, and frames only. Hours are also shown if necessary, but not by default +bl_use_preview +Draw Faces +Vertex Group Rotation Negate +\ +New Window +Turbulent noise driven by particle velocity +Lock Rotation +Color Source +Print state debug info in the game engine +Location of head of the channel's bone +Timer +Output video in Xvid format +Enable raytraced reflections +Image Preview +Optional space type keymap is associated with +Use ramps for GLSL rendering +Motion Samples +Vectorscope Opacity +Element defining a color at a position in the color ramp +All Action Keyframes +Automatic keyframe insertion for Objects and Bones (default setting used for new Scenes) +Align Object To +Welding threshold: distance between nearby vertices to be considered equal => set to 0.0 to disable welding test and speed up scene loading (ok if the mesh has no duplicates) +Limit +T +Diffuse Color +Release +User defined string text value in a string properties layer +Histogram for viewing image statistics +Scroll Widget Colors +General media friction for point movements +Lock Y Rotation Axis +Set audio mixing buffer size to 1024 samples +Draw the image repeated outside of the main view +Mesh Int Property +Noodle curving +Unknown Type +Add & Replace +Border Collisions +Add children to form a compound collision object +Influence +Show high resolution (using amplification) +Collection of sounds +Use Bone Heads +Actuator to apply actions in the game engine +Mp3 +Go to closest enemy and attack when in range +Constraint Target +Use trackball style rotation in the viewport +32768 +Overwrite +Duplicate Particle +32-bit Signed +Scale +Expression to use for Scripted Expression +Pre-calculate the shading information into a voxel grid, speeds up shading at slightly less accuracy +Parameters +Material Mode +Avoid +Cache is outdated +Actor +Bone Group Index +Toolbox Column Layout +Show the frames per second screen refresh rate, while animation is played back +Image Editor +Mesh Vertex Sticky Texture Coordinate +Physics engine used for physics simulation in the game engine +Average Spring length * Ball Size +Renders rings over halo +Offset in the random number table for child particles, to get a different randomized result +Auto Keying Mode +B-Bone Segments +Time in 1/10 seconds to hold the Left Mouse Button before opening the toolbox +Visible Layers +File format to save the rendered images as +Enable view navigation within the camera view +Show background image in top view +Sun brightness +Closest +Make this curve or surface a closed loop in the U direction +Command history +XYZ Rotation Order. Prone to Gimbal Lock +Draw Stretch Type +Cyclic +F-Curve and its keyframes are hidden in the Graph Editor graphs +Scale factor along the Y for items in this (sub)layout. +F-Curve Editor +Area distortion between UV and 3D faces +YXZ Rotation Order. Prone to Gimbal Lock +Effective but slow compression +Fields +For bone motion paths, search whole Action for keyframes instead of in group with matching name only (is slower) +Process the render result through the compositing pipeline, if compositing nodes are enabled +Co-ordinate system to cache particles in +Curve guide effector weight +Theme settings for the Logic Editor +Default +Black Level +ISO 1 +Fine tunes texture mapping X, Y and Z locations +Single Property +Korean (한국 언어) +DopeSheet Sub-Channel +Max Air Speed +Vertex Group Length Negate +Key location for a particle over time +Render a user-defined border region, within the frame size. Note, this disables save_buffers and full_sample +Range +Materials +Show hidden dot files +Numpad Enter +Polish (Polski) +Automatic saving of temporary files in temp directory, uses process ID +Cubic B-Spline +Logic editor space data +Open menu buttons and pulldowns automatically when the mouse is hovering +Display zoom level +Stamp Filename +Weight +Bias (in radians) to prevent smoothed faces from showing banding (for Raytrace Constant Jittered) +Auto XYZ to RGB +UV +Audio volume +Wire Select +Replace +Show paint related properties +Target Space +Gloss Samples +UI +Keep horizon level while flying with 3D Mouse +Texture Mode +Shaded + Multiple Scattering +Lifetime +Settings for particle fluids physics +Type of units for this property +Pointer +Field Settings +PoseBone Constraints +Right Ctrl +User Key Configuration +Color 3 +Speakers +Color 1 +Spline Points +Color 4 +Gradient +Rule Fuzziness +YZX Rotation Order. Prone to Gimbal Lock +Amount of residual error in radiant for constraints that work on orientation +GLSL Shadows +Undo Steps +Show the entire viewport in the display window, using bar horizontally or vertically +Dissolve Smoke +Internal +Library file the datablock is linked from +Outer face thickness +Any modifier keys pressed +Screen aligned billboard +Allow moving the mouse outside the view on some manipulations (transform, ui control drag) +NLA Strips that this strip acts as a container for (if it is of type Meta) +Pixel Cache +Texture slot name +Render Stamp +bl_label +Settings for interacting with Blender data +Ball +Active Clone +Editbone Matrix +ja_JP +Curve in a curve mapping +Auto Rainbow +Maximum angular velocity in air (relative to 180 degrees) +Operator Properties +Material Raytrace Transparency +Child +Modal Keymap +Color to use behind stamp text +Theme settings for the graph editor +Aligned +Border Maximum X +Border Maximum Y +Type of event +Set color of the bars +Collapse Summary +How many collision iterations should be done. (higher is better quality but slower) +Consant falloff +Fields Still +Main Sounds +Definition of a choice in an RNA enum property +Translate Tooltips +Sync Markers +Object being duplicated +Face in a Mesh datablock +Calculate bone paths from tails +Defines the structure of the header in the UI. +UV Pinned +No Collision +Active Channel Group +Make face invisible +Number of subdivisions of bone (for B-Bones only) +Renders halo as a lens flare +Only Selected Channels +Theme settings for the Outliner +Stroke data points +Multiply Vertex Group with Envelope +Inner face thickness +Set actuator expanded in the user interface +Low values are slower and higher quality +Vertices Cache +Keep UV and edit mode mesh selection in sync +Particle Key +Set controller expanded in the user interface +Duplicate Curve +List of background images +Manipulator Handle Size +Alive +Lock Z Axis +Tex +A square showing Saturation/Value, with Hue slider +Deliver material index pass +XXX todo +Collection of spline points +Flock +Linear Light +Live Unwrap +Radiosity +Turbulence Influence +Left Shift +The source of this force field is the zero point of a harmonic oscillator +Driver Target +CIE +Show High Resolution +Pin Cloth +Soft Body Settings +Threads +Negate the effect of the roughness end vertex group +Gloss Threshold +World Space +Game data for a Scene datablock +Blender 2.4 +Coordinates of the right handle (after the control point) +F-Curves in this group +Point cache list +3D View Region +Show the X axis line in perspective view +Matroska +Extinction scattering contribution factor +Callback function defines for builtin Keying Sets +Generate point density from an object's vertices +Coulomb friction coefficient, when inside the physics distance area +Temporary +Vertex group to control size +Time in milliseconds between each frame recorded for screencast +Low Resolution Mesh +Maximum structural stiffness value +Maximum radial distance for the field to work +Collection of point caches +Volume +Asymmetry +Mux rate (bits/s(!)) +Weight value of a vertex in a vertex group +Log conversion reference blackpoint +Point density settings +Display datablocks of active object +Show Mouse +Name of Action Group to assign setting(s) for this path to +Rotate +Multiplier for multiple scattered light energy +09 - Theme Color Set +(Min+Max)/2 * Ball Size +Flow +Output image in Radiance HDR format +Show Expanded +11 - Theme Color Set +Front scattering weight +Maximum speed for jumping +Compositor Nodes +Particle in a particle system +Vertex Group +U +Bending Stiffness Vertex Group +Context +Vertex selection mode +Use scaled but un-grid-fitted kerning distances +Gloss Amount +3D region that defines the quad view settings +Display groups and their datablocks +Include visualization of Curve related Animation data +User Modified +Statistical view of the levels of color in an image +Cubic Catmull-Rom +Anisotropic Friction +4x +Inverse Gain +Fade Time +Visual Keying +Underline +Translate Interface +Property Definition +Bake Mirror colors +Animated Strip Time +Friction Factor +Space data for a screen area +Maximum speed on land +Theme User Interface +Deflect Emitter +Use Edges +The base density of the volume diff --git a/po/update_mo.py b/po/update_mo.py index c0870f3fbb3..4effdc65541 100755 --- a/po/update_mo.py +++ b/po/update_mo.py @@ -1,6 +1,6 @@ #!/usr/bin/python -#update all mo files in the LANGS +# update all mo files in the LANGS import os diff --git a/po/update_po.py b/po/update_po.py index 8a2f61ba46f..50459c2b14b 100755 --- a/po/update_po.py +++ b/po/update_po.py @@ -1,6 +1,6 @@ #!/usr/bin/python -#update all po files in the LANGS +# update all po files in the LANGS import os diff --git a/po/update_pot.py b/po/update_pot.py index 5b5fe35ae35..616443edc4a 100755 --- a/po/update_pot.py +++ b/po/update_pot.py @@ -1,6 +1,6 @@ #!/usr/bin/python -#update the pot file according the POTFILES.in +# update the pot file according the POTFILES.in import os @@ -12,3 +12,50 @@ cmd = "%s --files-from=%s/po/POTFILES.in --keyword=_ --keyword=N_ --directory=%s GETTEXT_XGETTEXT_EXECUTABLE, SOURCE_DIR, SOURCE_DIR, SOURCE_DIR, DOMAIN) os.system( cmd ) + +def stripeol(s): + if line.endswith("\n"): + s = s[:-1] + + if line.endswith("\r"): + s = s[:-1] + + return s + +pot_messages = {} +reading_message = False +message = "" +with open("blender.pot", 'r') as handle: + while True: + line = handle.readline() + + if not line: + break + + line = stripeol(line) + if line.startswith("msgid"): + reading_message = True + message = line[7:-1] + elif line.startswith("msgstr"): + reading_message = False + pot_messages[message] = True + elif reading_message: + message += line[1:-1] + +# add messages collected automatically from RNA +with open("blender.pot", "a") as pot_handle: + with open("messages.txt", 'r') as handle: + while True: + line = handle.readline() + + if not line: + break + + line = stripeol(line) + line = line.replace("\\", "\\\\") + line = line.replace("\"", "\\\"") + + if not pot_messages.get(line): + pot_handle.write("\n#: Automatically collected from RNA\n") + pot_handle.write("msgid \"%s\"\n" % (line)) + pot_handle.write("msgstr \"\"\n") diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index 2d779f2ddda..388ae2b0e13 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -19,7 +19,7 @@ # import bpy -from blf import gettext as _ + def rna_idprop_ui_get(item, create=True): try: @@ -145,7 +145,7 @@ def draw(layout, context, context_member, property_type, use_edit=True): if use_edit: row = split.row(align=True) - prop = row.operator("wm.properties_edit", text=_("edit")) + prop = row.operator("wm.properties_edit", text="edit") assign_props(prop, val_draw, key) prop = row.operator("wm.properties_remove", text="", icon='ZOOMOUT') @@ -157,7 +157,7 @@ class PropertyPanel(): The subclass should have its own poll function and the variable '_context_path' MUST be set. """ - bl_label = _("Custom Properties") + bl_label = "Custom Properties" bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_operators/animsys_update.py b/release/scripts/startup/bl_operators/animsys_update.py index 1c4176d96fa..23b9cf13f07 100644 --- a/release/scripts/startup/bl_operators/animsys_update.py +++ b/release/scripts/startup/bl_operators/animsys_update.py @@ -17,7 +17,6 @@ # ##### END GPL LICENSE BLOCK ##### # -from blf import gettext as _ data_path_update = [ ("ClothCollisionSettings", "min_distance", "distance_min"), @@ -693,7 +692,6 @@ class UpdateAnimData(Operator): """Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves""" bl_idname = "anim.update_data_paths" bl_label = "Update Animation Data" - __doc__ = _("Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves") def execute(self, context): import animsys_refactor diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index bd879fa8679..6c9f27afaa5 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -21,29 +21,28 @@ import bpy from bpy.types import Operator from bpy.props import StringProperty, BoolProperty, EnumProperty, IntProperty -from blf import gettext as _ class SelectPattern(Operator): '''Select object matching a naming pattern''' bl_idname = "object.select_pattern" - bl_label = _("Select Pattern") + bl_label = "Select Pattern" bl_options = {'REGISTER', 'UNDO'} pattern = StringProperty( - name=_("Pattern"), - description=_("Name filter using '*' and '?' wildcard chars"), + name="Pattern", + description="Name filter using '*' and '?' wildcard chars", maxlen=32, default="*", ) case_sensitive = BoolProperty( - name=_("Case Sensitive"), - description=_("Do a case sensitive compare"), + name="Case Sensitive", + description="Do a case sensitive compare", default=False, ) extend = BoolProperty( - name=_("Extend"), - description=_("Extend the existing selection"), + name="Extend", + description="Extend the existing selection", default=True, ) @@ -104,7 +103,7 @@ class SelectPattern(Operator): class SelectCamera(Operator): '''Select object matching a naming pattern''' bl_idname = "object.select_camera" - bl_label = _("Select Camera") + bl_label = "Select Camera" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -126,20 +125,20 @@ class SelectHierarchy(Operator): '''Select object relative to the active objects position''' \ '''in the hierarchy''' bl_idname = "object.select_hierarchy" - bl_label = _("Select Hierarchy") + bl_label = "Select Hierarchy" bl_options = {'REGISTER', 'UNDO'} direction = EnumProperty( - items=(('PARENT', _("Parent"), ""), - ('CHILD', _("Child"), "") + items=(('PARENT', "Parent", ""), + ('CHILD', "Child", ""), ), - name=_("Direction"), - description=_("Direction to select in the hierarchy"), + name="Direction", + description="Direction to select in the hierarchy", default='PARENT') extend = BoolProperty( - name=_("Extend"), - description=_("Extend the existing selection"), + name="Extend", + description="Extend the existing selection", default=False, ) @@ -193,19 +192,20 @@ class SubdivisionSet(Operator): '''Sets a Subdivision Surface Level (1-5)''' bl_idname = "object.subdivision_set" - bl_label = _("Subdivision Set") + bl_label = "Subdivision Set" bl_options = {'REGISTER', 'UNDO'} level = IntProperty( - name=_("Level"), + name="Level", min=-100, max=100, soft_min=-6, soft_max=6, default=1, ) relative = BoolProperty( - name=_("Relative"), - description=_("Apply the subsurf level as an offset relative to the current level"), + name="Relative", + description=("Apply the subsurf level as an offset " + "relative to the current level"), default=False, ) @@ -273,30 +273,31 @@ class ShapeTransfer(Operator): '''applying the relative offsets''' bl_idname = "object.shape_key_transfer" - bl_label = _("Transfer Shape Key") + bl_label = "Transfer Shape Key" bl_options = {'REGISTER', 'UNDO'} mode = EnumProperty( items=(('OFFSET', - _("Offset"), - _("Apply the relative positional offset") + "Offset", + "Apply the relative positional offset", ), ('RELATIVE_FACE', - _("Relative Face"), - _("Calculate relative position (using faces)."), + "Relative Face", + "Calculate relative position (using faces).", ), ('RELATIVE_EDGE', - _("Relative Edge"), - _("Calculate relative position (using edges)."), + "Relative Edge", + "Calculate relative position (using edges).", ), ), - name=_("Transformation Mode"), - description=_("Relative shape positions to the new shape method"), + name="Transformation Mode", + description="Relative shape positions to the new shape method", default='OFFSET', ) use_clamp = BoolProperty( - name=_("Clamp Offset"), - description=_("Clamp the transformation to the distance each vertex moves in the original shape."), + name="Clamp Offset", + description=("Clamp the transformation to the distance each " + "vertex moves in the original shape."), default=False, ) @@ -514,7 +515,7 @@ class ShapeTransfer(Operator): class JoinUVs(Operator): '''Copy UV Layout to objects with matching geometry''' bl_idname = "object.join_uvs" - bl_label = _("Join as UVs") + bl_label = "Join as UVs" @classmethod def poll(cls, context): @@ -582,7 +583,7 @@ class JoinUVs(Operator): class MakeDupliFace(Operator): '''Make linked objects into dupli-faces''' bl_idname = "object.make_dupli_face" - bl_label = _("Make Dupli-Face") + bl_label = "Make Dupli-Face" @classmethod def poll(cls, context): @@ -657,7 +658,7 @@ class IsolateTypeRender(Operator): '''Hide unselected render objects of same type as active ''' \ '''by setting the hide render flag''' bl_idname = "object.isolate_type_render" - bl_label = _("Restrict Render Unselected") + bl_label = "Restrict Render Unselected" bl_options = {'REGISTER', 'UNDO'} def execute(self, context): @@ -677,7 +678,7 @@ class IsolateTypeRender(Operator): class ClearAllRestrictRender(Operator): '''Reveal all render objects by setting the hide render flag''' bl_idname = "object.hide_render_clear_all" - bl_label = _("Clear All Restrict Render") + bl_label = "Clear All Restrict Render" bl_options = {'REGISTER', 'UNDO'} def execute(self, context): diff --git a/release/scripts/startup/bl_operators/object_align.py b/release/scripts/startup/bl_operators/object_align.py index c70b33598b4..50e9bfb5b98 100644 --- a/release/scripts/startup/bl_operators/object_align.py +++ b/release/scripts/startup/bl_operators/object_align.py @@ -21,7 +21,6 @@ import bpy from bpy.types import Operator from mathutils import Vector -from blf import gettext as _ def GlobalBB_LQ(bb_world): @@ -344,16 +343,18 @@ from bpy.props import EnumProperty, BoolProperty class AlignObjects(Operator): '''Align Objects''' bl_idname = "object.align" - bl_label = _("Align Objects") + bl_label = "Align Objects" bl_options = {'REGISTER', 'UNDO'} bb_quality = BoolProperty( - name=_("High Quality"), - description=_("Enables high quality calculation of the bounding box for perfect results on complex shape meshes with rotation/scale (Slow)"), + name="High Quality", + description=("Enables high quality calculation of the " + "bounding box for perfect results on complex " + "shape meshes with rotation/scale (Slow)"), default=True, ) align_mode = EnumProperty( - name=_("Align Mode:"), + name="Align Mode:", items=(('OPT_1', "Negative Sides", ""), ('OPT_2', "Centers", ""), ('OPT_3', "Positive Sides", ""), @@ -361,7 +362,7 @@ class AlignObjects(Operator): default='OPT_2', ) relative_to = EnumProperty( - name=_("Relative To:"), + name="Relative To:", items=(('OPT_1', "Scene Origin", ""), ('OPT_2', "3D Cursor", ""), ('OPT_3', "Selection", ""), @@ -370,8 +371,8 @@ class AlignObjects(Operator): default='OPT_4', ) align_axis = EnumProperty( - name=_("Align"), - description=_("Align to axis"), + name="Align", + description="Align to axis", items=(('X', "X", ""), ('Y', "Y", ""), ('Z', "Z", ""), diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index 7b616ea5dca..48b547980d4 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -27,7 +27,7 @@ from bpy.props import (BoolProperty, FloatProperty, FloatVectorProperty, ) -from blf import gettext as _ + def object_ensure_material(obj, mat_name): """ Use an existing material or add a new one. @@ -306,8 +306,8 @@ class QuickSmoke(Operator): ) show_flows = BoolProperty( - name=_("Render Smoke Objects"), - description=_("Keep the smoke objects visible during rendering."), + name="Render Smoke Objects", + description="Keep the smoke objects visible during rendering.", default=False, ) @@ -420,20 +420,21 @@ class QuickFluid(Operator): default='BASIC', ) initial_velocity = FloatVectorProperty( - name=_("Initial Velocity"), - description=_("Initial velocity of the fluid"), + name="Initial Velocity", + description="Initial velocity of the fluid", min=-100.0, max=100.0, default=(0.0, 0.0, 0.0), subtype='VELOCITY', ) show_flows = BoolProperty( - name=_("Render Fluid Objects"), - description=_("Keep the fluid objects visible during rendering."), + name="Render Fluid Objects", + description="Keep the fluid objects visible during rendering.", default=False, ) start_baking = BoolProperty( - name=_("Start Fluid Bake"), - description=_("Start baking the fluid immediately after creating the domain object"), + name="Start Fluid Bake", + description=("Start baking the fluid immediately " + "after creating the domain object"), default=False, ) diff --git a/release/scripts/startup/bl_operators/object_randomize_transform.py b/release/scripts/startup/bl_operators/object_randomize_transform.py index 2f40741bb18..7aea18487f3 100644 --- a/release/scripts/startup/bl_operators/object_randomize_transform.py +++ b/release/scripts/startup/bl_operators/object_randomize_transform.py @@ -19,9 +19,7 @@ # import bpy - from bpy.types import Operator -from blf import gettext as _ def randomize_selected(seed, delta, loc, rot, scale, scale_even): @@ -93,55 +91,57 @@ from bpy.props import IntProperty, BoolProperty, FloatVectorProperty class RandomizeLocRotSize(Operator): '''Randomize objects loc/rot/scale''' bl_idname = "object.randomize_transform" - bl_label = _("Randomize Transform") + bl_label = "Randomize Transform" bl_options = {'REGISTER', 'UNDO'} random_seed = IntProperty( - name=_("Random Seed"), - description=_("Seed value for the random generator"), + name="Random Seed", + description="Seed value for the random generator", min=0, max=1000, default=0, ) use_delta = BoolProperty( - name=_("Transform Delta"), - description=_("Randomize delta transform values instead of regular transform"), + name="Transform Delta", + description=("Randomize delta transform values " + "instead of regular transform"), default=False, ) use_loc = BoolProperty( - name=_("Randomize Location"), - description=_("Randomize the location values"), + name="Randomize Location", + description="Randomize the location values", default=True, ) loc = FloatVectorProperty( - name=_("Location"), - description=_("Maximun distance the objects can spread over each axis"), + name="Location", + description=("Maximun distance the objects " + "can spread over each axis"), min=-100.0, max=100.0, default=(0.0, 0.0, 0.0), subtype='TRANSLATION', ) use_rot = BoolProperty( - name=_("Randomize Rotation"), - description=_("Randomize the rotation values"), + name="Randomize Rotation", + description="Randomize the rotation values", default=True, ) rot = FloatVectorProperty( - name=_("Rotation"), - description=_("Maximun rotation over each axis"), + name="Rotation", + description="Maximun rotation over each axis", min=-180.0, max=180.0, default=(0.0, 0.0, 0.0), subtype='TRANSLATION', ) use_scale = BoolProperty( - name=_("Randomize Scale"), - description=_("Randomize the scale values"), + name="Randomize Scale", + description="Randomize the scale values", default=True, ) scale_even = BoolProperty( - name=_("Scale Even"), - description=_("Use the same scale value for all axis"), + name="Scale Even", + description="Use the same scale value for all axis", default=False, ) @@ -153,8 +153,8 @@ class RandomizeLocRotSize(Operator): )''' scale = FloatVectorProperty( - name=_("Scale"), - description=_("Maximum scale randomization over each axis"), + name="Scale", + description="Maximum scale randomization over each axis", min=-100.0, max=100.0, default=(0.0, 0.0, 0.0), diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index ec0a650dd40..2fd0c4a9e12 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -20,7 +20,6 @@ import bpy from bpy.types import Menu, Operator -from blf import gettext as _ class AddPresetBase(): @@ -33,8 +32,8 @@ class AddPresetBase(): bl_options = {'REGISTER'} # only because invoke_props_popup requires. name = bpy.props.StringProperty( - name=_("Name"), - description=_("Name of the preset, used to make the path name"), + name="Name", + description="Name of the preset, used to make the path name", maxlen=64, ) remove_active = bpy.props.BoolProperty( @@ -145,17 +144,16 @@ class AddPresetBase(): class ExecutePreset(Operator): ''' Executes a preset ''' bl_idname = "script.execute_preset" - bl_label = _("Execute a Python Preset") - __doc__ = _(" Executes a preset ") + bl_label = "Execute a Python Preset" filepath = bpy.props.StringProperty( - name=_("Path"), - description=_("Path of the Python file to execute"), + name="Path", + description="Path of the Python file to execute", maxlen=512, ) menu_idname = bpy.props.StringProperty( - name=_("Menu ID Name"), - description=_("ID name of the menu this was called from"), + name="Menu ID Name", + description="ID name of the menu this was called from", ) def execute(self, context): @@ -174,7 +172,7 @@ class ExecutePreset(Operator): class AddPresetRender(AddPresetBase, Operator): '''Add a Render Preset''' bl_idname = "render.preset_add" - bl_label = _("Add Render Preset") + bl_label = "Add Render Preset" preset_menu = "RENDER_MT_presets" preset_defines = [ @@ -200,9 +198,8 @@ class AddPresetRender(AddPresetBase, Operator): class AddPresetSSS(AddPresetBase, Operator): '''Add a Subsurface Scattering Preset''' bl_idname = "material.sss_preset_add" - bl_label = _("Add SSS Preset") + bl_label = "Add SSS Preset" preset_menu = "MATERIAL_MT_sss_presets" - __doc__ = _("Add a Subsurface Scattering Preset") preset_defines = [ ("material = " @@ -229,7 +226,7 @@ class AddPresetSSS(AddPresetBase, Operator): class AddPresetCloth(AddPresetBase, Operator): '''Add a Cloth Preset''' bl_idname = "cloth.preset_add" - bl_label = _("Add Cloth Preset") + bl_label = "Add Cloth Preset" preset_menu = "CLOTH_MT_presets" preset_defines = [ @@ -251,7 +248,7 @@ class AddPresetCloth(AddPresetBase, Operator): class AddPresetSunSky(AddPresetBase, Operator): '''Add a Sky & Atmosphere Preset''' bl_idname = "lamp.sunsky_preset_add" - bl_label = _("Add Sunsky Preset") + bl_label = "Add Sunsky Preset" preset_menu = "LAMP_MT_sunsky_presets" preset_defines = [ @@ -280,9 +277,8 @@ class AddPresetSunSky(AddPresetBase, Operator): class AddPresetInteraction(AddPresetBase, Operator): '''Add an Application Interaction Preset''' bl_idname = "wm.interaction_preset_add" - bl_label = _("Add Interaction Preset") + bl_label = "Add Interaction Preset" preset_menu = "USERPREF_MT_interaction_presets" - __doc__ = _('Add an Application Interaction Preset') preset_defines = [ "user_preferences = bpy.context.user_preferences" @@ -307,10 +303,9 @@ class AddPresetInteraction(AddPresetBase, Operator): class AddPresetKeyconfig(AddPresetBase, Operator): '''Add a Keyconfig Preset''' bl_idname = "wm.keyconfig_preset_add" - bl_label = _("Add Keyconfig Preset") + bl_label = "Add Keyconfig Preset" preset_menu = "USERPREF_MT_keyconfigs" preset_subdir = "keyconfig" - __doc__ = _('Add a Keyconfig Preset') def add(self, context, filepath): bpy.ops.wm.keyconfig_export(filepath=filepath) @@ -331,12 +326,11 @@ class AddPresetKeyconfig(AddPresetBase, Operator): class AddPresetOperator(AddPresetBase, Operator): '''Add an Application Interaction Preset''' bl_idname = "wm.operator_preset_add" - bl_label = _("Operator Preset") + bl_label = "Operator Preset" preset_menu = "WM_MT_operator_presets" - __doc__ = _("Add an Application Interaction Preset") operator = bpy.props.StringProperty( - name=_("Operator"), + name="Operator", maxlen=64, options={'HIDDEN'}, ) @@ -375,7 +369,7 @@ class AddPresetOperator(AddPresetBase, Operator): class WM_MT_operator_presets(Menu): - bl_label = _("Operator Presets") + bl_label = "Operator Presets" def draw(self, context): self.operator = context.space_data.operator.bl_idname diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index 32226ec0b1e..c2a09d6a4ae 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -23,7 +23,6 @@ import bpy from bpy.types import Operator import os -from blf import gettext as _ def guess_player_path(preset): @@ -69,9 +68,8 @@ def guess_player_path(preset): class PlayRenderedAnim(Operator): '''Plays back rendered frames/movies using an external player.''' bl_idname = "render.play_rendered_anim" - bl_label = _("Play Rendered Animation") + bl_label = "Play Rendered Animation" bl_options = {'REGISTER'} - __doc__ = _("Plays back rendered frames/movies using an external player.") def execute(self, context): import subprocess diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index 44fb0b2efb4..856e182279a 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -22,14 +22,13 @@ import bpy from bpy.types import Operator from bpy.props import IntProperty -from blf import gettext as _ class SequencerCrossfadeSounds(Operator): '''Do crossfading volume animation of two selected sound strips.''' bl_idname = "sequencer.crossfade_sounds" - bl_label = _("Crossfade sounds") + bl_label = "Crossfade sounds" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -80,11 +79,11 @@ class SequencerCutMulticam(Operator): '''Cut multicam strip and select camera.''' bl_idname = "sequencer.cut_multicam" - bl_label = _("Cut multicam") + bl_label = "Cut multicam" bl_options = {'REGISTER', 'UNDO'} camera = IntProperty( - name=_("Camera"), + name="Camera", min=1, max=32, soft_min=1, soft_max=32, default=1, @@ -122,9 +121,8 @@ class SequencerDeinterlaceSelectedMovies(Operator): '''Deinterlace all selected movie sources.''' bl_idname = "sequencer.deinterlace_selected_movies" - bl_label = _("Deinterlace Movies") + bl_label = "Deinterlace Movies" bl_options = {'REGISTER', 'UNDO'} - __doc__ = _("Deinterlace all selected movie sources.") @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 4f37d0287e3..63ee6c8b5d2 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -28,13 +28,12 @@ from bpy.props import (StringProperty, ) from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear -from blf import gettext as _ class MESH_OT_delete_edgeloop(Operator): '''Delete an edge loop by merging the faces on each side to a single face loop''' bl_idname = "mesh.delete_edgeloop" - bl_label = _("Delete Edge Loop") + bl_label = "Delete Edge Loop" def execute(self, context): if 'FINISHED' in bpy.ops.transform.edge_slide(value=1.0): @@ -45,20 +44,20 @@ class MESH_OT_delete_edgeloop(Operator): return {'CANCELLED'} rna_path_prop = StringProperty( - name=_("Context Attributes"), - description=_("rna context string"), + name="Context Attributes", + description="rna context string", maxlen=1024, ) rna_reverse_prop = BoolProperty( - name=_("Reverse"), - description=_("Cycle backwards"), + name="Reverse", + description="Cycle backwards", default=False, ) rna_relative_prop = BoolProperty( - name=_("Relative"), - description=_("Apply relative to the current value (delta)"), + name="Relative", + description="Apply relative to the current value (delta)", default=False, ) @@ -141,16 +140,16 @@ def execute_context_assign(self, context): class BRUSH_OT_active_index_set(Operator): '''Set active sculpt/paint brush from it's number''' bl_idname = "brush.active_index_set" - bl_label = _("Set Brush Number") + bl_label = "Set Brush Number" mode = StringProperty( - name=_("mode"), - description=_("Paint mode to set brush for"), + name="mode", + description="Paint mode to set brush for", maxlen=1024, ) index = IntProperty( - name=_("number"), - description=_("Brush number"), + name="number", + description="Brush number", ) _attr_dict = {"sculpt": "use_paint_sculpt", @@ -175,13 +174,13 @@ class BRUSH_OT_active_index_set(Operator): class WM_OT_context_set_boolean(Operator): '''Set a context value.''' bl_idname = "wm.context_set_boolean" - bl_label = _("Context Set Boolean") + bl_label = "Context Set Boolean" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = BoolProperty( - name=_("Value"), - description=_("Assignment value"), + name="Value", + description="Assignment value", default=True, ) @@ -191,13 +190,13 @@ class WM_OT_context_set_boolean(Operator): class WM_OT_context_set_int(Operator): # same as enum '''Set a context value.''' bl_idname = "wm.context_set_int" - bl_label = _("Context Set") + bl_label = "Context Set" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = IntProperty( - name=_("Value"), - description=_("Assign value"), + name="Value", + description="Assign value", default=0, ) relative = rna_relative_prop @@ -208,18 +207,18 @@ class WM_OT_context_set_int(Operator): # same as enum class WM_OT_context_scale_int(Operator): '''Scale an int context value.''' bl_idname = "wm.context_scale_int" - bl_label = _("Context Set") + bl_label = "Context Set" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = FloatProperty( - name=_("Value"), - description=_("Assign value"), + name="Value", + description="Assign value", default=1.0, ) always_step = BoolProperty( - name=_("Always Step"), - description=_("Always adjust the value by a minimum of 1 when 'value' is not 1.0."), + name="Always Step", + description="Always adjust the value by a minimum of 1 when 'value' is not 1.0.", default=True, ) @@ -251,13 +250,13 @@ class WM_OT_context_scale_int(Operator): class WM_OT_context_set_float(Operator): # same as enum '''Set a context value.''' bl_idname = "wm.context_set_float" - bl_label = _("Context Set Float") + bl_label = "Context Set Float" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = FloatProperty( - name=_("Value"), - description=_("Assignment value"), + name="Value", + description="Assignment value", default=0.0, ) relative = rna_relative_prop @@ -268,13 +267,13 @@ class WM_OT_context_set_float(Operator): # same as enum class WM_OT_context_set_string(Operator): # same as enum '''Set a context value.''' bl_idname = "wm.context_set_string" - bl_label = _("Context Set String") + bl_label = "Context Set String" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = StringProperty( - name=_("Value"), - description=_("Assign value"), + name="Value", + description="Assign value", maxlen=1024, ) @@ -284,13 +283,13 @@ class WM_OT_context_set_string(Operator): # same as enum class WM_OT_context_set_enum(Operator): '''Set a context value.''' bl_idname = "wm.context_set_enum" - bl_label = _("Context Set Enum") + bl_label = "Context Set Enum" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = StringProperty( - name=_("Value"), - description=_("Assignment value (as a string)"), + name="Value", + description="Assignment value (as a string)", maxlen=1024, ) @@ -300,13 +299,13 @@ class WM_OT_context_set_enum(Operator): class WM_OT_context_set_value(Operator): '''Set a context value.''' bl_idname = "wm.context_set_value" - bl_label = _("Context Set Value") + bl_label = "Context Set Value" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = StringProperty( - name=_("Value"), - description=_("Assignment value (as a string)"), + name="Value", + description="Assignment value (as a string)", maxlen=1024, ) @@ -321,7 +320,7 @@ class WM_OT_context_set_value(Operator): class WM_OT_context_toggle(Operator): '''Toggle a context value.''' bl_idname = "wm.context_toggle" - bl_label = _("Context Toggle") + bl_label = "Context Toggle" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop @@ -340,18 +339,18 @@ class WM_OT_context_toggle(Operator): class WM_OT_context_toggle_enum(Operator): '''Toggle a context value.''' bl_idname = "wm.context_toggle_enum" - bl_label = _("Context Toggle Values") + bl_label = "Context Toggle Values" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value_1 = StringProperty( - name=_("Value"), - description=_("Toggle enum"), + name="Value", + description="Toggle enum", maxlen=1024, ) value_2 = StringProperty( - name=_("Value"), - description=_("Toggle enum"), + name="Value", + description="Toggle enum", maxlen=1024, ) @@ -374,7 +373,7 @@ class WM_OT_context_cycle_int(Operator): '''Set a context value. Useful for cycling active material, ''' '''vertex keys, groups' etc.''' bl_idname = "wm.context_cycle_int" - bl_label = _("Context Int Cycle") + bl_label = "Context Int Cycle" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop @@ -408,7 +407,7 @@ class WM_OT_context_cycle_int(Operator): class WM_OT_context_cycle_enum(Operator): '''Toggle a context value.''' bl_idname = "wm.context_cycle_enum" - bl_label = _("Context Enum Cycle") + bl_label = "Context Enum Cycle" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop @@ -461,7 +460,7 @@ class WM_OT_context_cycle_array(Operator): '''Set a context array value. Useful for cycling the active mesh edit mode.''' bl_idname = "wm.context_cycle_array" - bl_label = _("Context Array Cycle") + bl_label = "Context Array Cycle" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop @@ -507,7 +506,7 @@ class WM_MT_context_menu_enum(Menu): class WM_OT_context_menu_enum(Operator): bl_idname = "wm.context_menu_enum" - bl_label = _("Context Enum Menu") + bl_label = "Context Enum Menu" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop @@ -521,13 +520,13 @@ class WM_OT_context_menu_enum(Operator): class WM_OT_context_set_id(Operator): '''Toggle a context value.''' bl_idname = "wm.context_set_id" - bl_label = _("Set Library ID") + bl_label = "Set Library ID" bl_options = {'UNDO', 'INTERNAL'} data_path = rna_path_prop value = StringProperty( - name=_("Value"), - description=_("Assign value"), + name="Value", + description="Assign value", maxlen=1024, ) @@ -557,13 +556,13 @@ class WM_OT_context_set_id(Operator): doc_id = StringProperty( - name=_("Doc ID"), + name="Doc ID", maxlen=1024, options={'HIDDEN'}, ) doc_new = StringProperty( - name=_("Edit Description"), + name="Edit Description", maxlen=1024, ) @@ -636,18 +635,18 @@ class WM_OT_context_collection_boolean_set(Operator): class WM_OT_context_modal_mouse(Operator): '''Adjust arbitrary values with mouse input''' bl_idname = "wm.context_modal_mouse" - bl_label = _("Context Modal Mouse") + bl_label = "Context Modal Mouse" bl_options = {'GRAB_POINTER', 'BLOCKING', 'UNDO', 'INTERNAL'} data_path_iter = data_path_iter data_path_item = data_path_item input_scale = FloatProperty( - description=_("Scale the mouse movement by this value before applying the delta"), + description="Scale the mouse movement by this value before applying the delta", default=0.01, ) invert = BoolProperty( - description=_("Invert the mouse input"), + description="Invert the mouse input", default=False, ) initial_x = IntProperty(options={'HIDDEN'}) @@ -729,7 +728,6 @@ class WM_OT_context_modal_mouse(Operator): class WM_OT_url_open(Operator): "Open a website in the Webbrowser" - __doc__ = _("Open a website in the Webbrowser") bl_idname = "wm.url_open" bl_label = "" @@ -750,7 +748,7 @@ class WM_OT_path_open(Operator): bl_label = "" filepath = StringProperty( - name=_("File Path"), + name="File Path", maxlen=1024, subtype='FILE_PATH', ) @@ -784,7 +782,7 @@ class WM_OT_path_open(Operator): class WM_OT_doc_view(Operator): '''Load online reference docs''' bl_idname = "wm.doc_view" - bl_label = _("View Documentation") + bl_label = "View Documentation" doc_id = doc_id if bpy.app.version_cycle == "release": @@ -839,7 +837,7 @@ class WM_OT_doc_view(Operator): class WM_OT_doc_edit(Operator): '''Load online reference docs''' bl_idname = "wm.doc_edit" - bl_label = _("Edit Documentation") + bl_label = "Edit Documentation" doc_id = doc_id doc_new = doc_new @@ -899,7 +897,7 @@ class WM_OT_doc_edit(Operator): def draw(self, context): layout = self.layout - layout.label(text=_("Descriptor ID")+": '%s'" % self.doc_id) + layout.label(text="Descriptor ID: '%s'" % self.doc_id) layout.prop(self, "doc_new", text="") def invoke(self, context, event): @@ -908,26 +906,26 @@ class WM_OT_doc_edit(Operator): rna_path = StringProperty( - name=_("Property Edit"), - description=_("Property data_path edit"), + name="Property Edit", + description="Property data_path edit", maxlen=1024, options={'HIDDEN'}, ) rna_value = StringProperty( - name=_("Property Value"), - description=_("Property value edit"), + name="Property Value", + description="Property value edit", maxlen=1024, ) rna_property = StringProperty( - name=_("Property Name"), - description=_("Property name edit"), + name="Property Name", + description="Property name edit", maxlen=1024, ) rna_min = FloatProperty( - name=_("Min"), + name="Min", default=0.0, precision=3, ) @@ -942,8 +940,7 @@ rna_max = FloatProperty( class WM_OT_properties_edit(Operator): '''Internal use (edit a property data_path)''' bl_idname = "wm.properties_edit" - bl_label = _("Edit Property") - __doc__ = _("Internal use (edit a property data_path)") + bl_label = "Edit Property" bl_options = {'REGISTER'} # only because invoke_props_popup requires. data_path = rna_path @@ -952,7 +949,7 @@ class WM_OT_properties_edit(Operator): min = rna_min max = rna_max description = StringProperty( - name=_("Tip"), + name="Tip", ) def execute(self, context): @@ -1030,8 +1027,7 @@ class WM_OT_properties_edit(Operator): class WM_OT_properties_add(Operator): '''Internal use (edit a property data_path)''' bl_idname = "wm.properties_add" - bl_label = _("Add Property") - __doc__ = _("Internal use (edit a property data_path)") + bl_label = "Add Property" data_path = rna_path @@ -1061,7 +1057,7 @@ class WM_OT_properties_context_change(Operator): bl_label = "" context = StringProperty( - name=_("Context"), + name="Context", maxlen=32, ) @@ -1073,8 +1069,7 @@ class WM_OT_properties_context_change(Operator): class WM_OT_properties_remove(Operator): '''Internal use (edit a property data_path)''' bl_idname = "wm.properties_remove" - bl_label = _("Remove Property") - __doc__ = _("Internal use (edit a property data_path)") + bl_label = "Remove Property" data_path = rna_path property = rna_property @@ -1088,10 +1083,10 @@ class WM_OT_properties_remove(Operator): class WM_OT_keyconfig_activate(Operator): bl_idname = "wm.keyconfig_activate" - bl_label = _("Activate Keyconfig") + bl_label = "Activate Keyconfig" filepath = StringProperty( - name=_("File Path"), + name="File Path", maxlen=1024, ) @@ -1102,7 +1097,7 @@ class WM_OT_keyconfig_activate(Operator): class WM_OT_appconfig_default(Operator): bl_idname = "wm.appconfig_default" - bl_label = _("Default Application Configuration") + bl_label = "Default Application Configuration" def execute(self, context): import os @@ -1119,7 +1114,7 @@ class WM_OT_appconfig_default(Operator): class WM_OT_appconfig_activate(Operator): bl_idname = "wm.appconfig_activate" - bl_label = _("Activate Application Configuration") + bl_label = "Activate Application Configuration" filepath = StringProperty( name="File Path", @@ -1141,8 +1136,7 @@ class WM_OT_appconfig_activate(Operator): class WM_OT_sysinfo(Operator): '''Generate System Info''' bl_idname = "wm.sysinfo" - bl_label = _("System Info") - __doc__ = _("Generate System Info") + bl_label = "System Info" def execute(self, context): import sys_info @@ -1150,10 +1144,60 @@ class WM_OT_sysinfo(Operator): return {'FINISHED'} +class WM_OT_get_messages(Operator): + bl_idname = "wm.get_messages" + bl_label = "Get Messages" + + def _putMessage(self, messages, msg): + if len(msg): + messages[msg] = True + + def _walkProperties(self, properties, messages): + for prop in properties: + self._putMessage(messages, prop.name) + self._putMessage(messages, prop.description) + + if isinstance(prop, bpy.types.EnumProperty): + for item in prop.enum_items: + self._putMessage(messages, item.name) + self._putMessage(messages, item.description) + + def _walkRNA(self, bl_rna, messages): + if bl_rna.name and bl_rna.name != bl_rna.identifier: + self._putMessage(messages, bl_rna.name) + + if bl_rna.description: + self._putMessage(messages, bl_rna.description) + + self._walkProperties(bl_rna.properties, messages) + + def _walkClass(self, cls, messages): + self._walkRNA(cls.bl_rna, messages) + + def execute(self, context): + messages = {} + + for cls in type(bpy.context).__base__.__subclasses__(): + self._walkClass(cls, messages) + + for cls in bpy.types.Space.__subclasses__(): + self._walkClass(cls, messages) + + for cls in bpy.types.Operator.__subclasses__(): + self._walkClass(cls, messages) + + text = bpy.data.texts.new(name="messages.txt") + for message in messages: + text.write(message + "\n") + self._walkClass(bpy.types.SpaceDopeSheetEditor, messages) + + return {'FINISHED'} + + class WM_OT_copy_prev_settings(Operator): '''Copy settings from previous version''' bl_idname = "wm.copy_prev_settings" - bl_label = _("Copy Previous Settings") + bl_label = "Copy Previous Settings" def execute(self, context): import os diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py index 6c5125b8e23..499ea4c95d4 100644 --- a/release/scripts/startup/bl_ui/properties_animviz.py +++ b/release/scripts/startup/bl_ui/properties_animviz.py @@ -28,7 +28,7 @@ from blf import gettext as _ class MotionPathButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' - bl_label = _("Motion Paths") + bl_label = "Motion Paths" bl_options = {'DEFAULT_CLOSED'} def draw_settings(self, context, avs, bones=False): @@ -66,7 +66,7 @@ class MotionPathButtonsPanel(): class OnionSkinButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' - bl_label = _("Onion Skinning") + bl_label = "Onion Skinning" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 708f485a0f8..e5729a24b91 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -50,7 +50,7 @@ class DATA_PT_context_arm(ArmatureButtonsPanel, Panel): class DATA_PT_skeleton(ArmatureButtonsPanel, Panel): - bl_label = _("Skeleton") + bl_label = "Skeleton" def draw(self, context): layout = self.layout @@ -76,7 +76,7 @@ class DATA_PT_skeleton(ArmatureButtonsPanel, Panel): class DATA_PT_display(ArmatureButtonsPanel, Panel): - bl_label = _("Display") + bl_label = "Display" def draw(self, context): layout = self.layout @@ -101,7 +101,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel): class DATA_PT_bone_group_specials(Menu): - bl_label = _("Bone Group Specials") + bl_label = "Bone Group Specials" def draw(self, context): layout = self.layout @@ -110,7 +110,7 @@ class DATA_PT_bone_group_specials(Menu): class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel): - bl_label = _("Bone Groups") + bl_label = "Bone Groups" @classmethod def poll(cls, context): @@ -170,7 +170,7 @@ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel): class DATA_PT_pose_library(ArmatureButtonsPanel, Panel): - bl_label = _("Pose Library") + bl_label = "Pose Library" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -216,7 +216,7 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel): # TODO: this panel will soon be depreceated too class DATA_PT_ghost(ArmatureButtonsPanel, Panel): - bl_label = _("Ghost") + bl_label = "Ghost" def draw(self, context): layout = self.layout @@ -243,7 +243,7 @@ class DATA_PT_ghost(ArmatureButtonsPanel, Panel): class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, Panel): - bl_label = _("iTaSC parameters") + bl_label = "iTaSC parameters" bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index 36c07bd1ef8..2c9b31fd88d 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -50,7 +50,7 @@ class BONE_PT_context_bone(BoneButtonsPanel, Panel): class BONE_PT_transform(BoneButtonsPanel, Panel): - bl_label = _("Transform") + bl_label = "Transform" @classmethod def poll(cls, context): @@ -104,7 +104,7 @@ class BONE_PT_transform(BoneButtonsPanel, Panel): class BONE_PT_transform_locks(BoneButtonsPanel, Panel): - bl_label = _("Transform Locks") + bl_label = "Transform Locks" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -137,7 +137,7 @@ class BONE_PT_transform_locks(BoneButtonsPanel, Panel): class BONE_PT_relations(BoneButtonsPanel, Panel): - bl_label = _("Relations") + bl_label = "Relations" def draw(self, context): layout = self.layout @@ -182,7 +182,7 @@ class BONE_PT_relations(BoneButtonsPanel, Panel): class BONE_PT_display(BoneButtonsPanel, Panel): - bl_label = _("Display") + bl_label = "Display" @classmethod def poll(cls, context): @@ -219,7 +219,7 @@ class BONE_PT_display(BoneButtonsPanel, Panel): class BONE_PT_inverse_kinematics(BoneButtonsPanel, Panel): - bl_label = _("Inverse Kinematics") + bl_label = "Inverse Kinematics" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -310,7 +310,7 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, Panel): class BONE_PT_deform(BoneButtonsPanel, Panel): - bl_label = _("Deform") + bl_label = "Deform" bl_options = {'DEFAULT_CLOSED'} def draw_header(self, context): diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index c07acea47d5..0d79ec99789 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -55,7 +55,7 @@ class DATA_PT_context_camera(CameraButtonsPanel, Panel): class DATA_PT_camera(CameraButtonsPanel, Panel): - bl_label = _("Lens") + bl_label = "Lens" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -113,7 +113,7 @@ class DATA_PT_camera(CameraButtonsPanel, Panel): class DATA_PT_camera_display(CameraButtonsPanel, Panel): - bl_label = _("Display") + bl_label = "Display" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 36f61c1bd54..eb68311c8e2 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -116,7 +116,7 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel): class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel): - bl_label = _("Texture Space") + bl_label = "Texture Space" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -135,7 +135,7 @@ class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel): class DATA_PT_geometry_curve(CurveButtonsPanel, Panel): - bl_label = _("Geometry") + bl_label = "Geometry" @classmethod def poll(cls, context): @@ -168,7 +168,7 @@ class DATA_PT_geometry_curve(CurveButtonsPanel, Panel): class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel): - bl_label = _("Path Animation") + bl_label = "Path Animation" def draw_header(self, context): curve = context.curve @@ -199,7 +199,7 @@ class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel): class DATA_PT_active_spline(CurveButtonsPanelActive, Panel): - bl_label = _("Active Spline") + bl_label = "Active Spline" def draw(self, context): layout = self.layout @@ -270,7 +270,7 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, Panel): class DATA_PT_font(CurveButtonsPanel, Panel): - bl_label = _("Font") + bl_label = "Font" @classmethod def poll(cls, context): @@ -334,7 +334,7 @@ class DATA_PT_font(CurveButtonsPanel, Panel): class DATA_PT_paragraph(CurveButtonsPanel, Panel): - bl_label = _("Paragraph") + bl_label = "Paragraph" @classmethod def poll(cls, context): @@ -363,7 +363,7 @@ class DATA_PT_paragraph(CurveButtonsPanel, Panel): class DATA_PT_text_boxes(CurveButtonsPanel, Panel): - bl_label = _("Text Boxes") + bl_label = "Text Boxes" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index 1a6aad684c4..b6fa6d8e839 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -32,7 +32,7 @@ class DataButtonsPanel(): class DATA_PT_empty(DataButtonsPanel, Panel): - bl_label = _("Empty") + bl_label = "Empty" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/properties_data_lamp.py b/release/scripts/startup/bl_ui/properties_data_lamp.py index 4ae6ad2a7c1..93ed8ca369b 100644 --- a/release/scripts/startup/bl_ui/properties_data_lamp.py +++ b/release/scripts/startup/bl_ui/properties_data_lamp.py @@ -67,7 +67,7 @@ class DATA_PT_context_lamp(DataButtonsPanel, Panel): class DATA_PT_preview(DataButtonsPanel, Panel): - bl_label = _("Preview") + bl_label = "Preview" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -75,7 +75,7 @@ class DATA_PT_preview(DataButtonsPanel, Panel): class DATA_PT_lamp(DataButtonsPanel, Panel): - bl_label = _("Lamp") + bl_label = "Lamp" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -117,7 +117,7 @@ class DATA_PT_lamp(DataButtonsPanel, Panel): class DATA_PT_sunsky(DataButtonsPanel, Panel): - bl_label = _("Sky & Atmosphere") + bl_label = "Sky & Atmosphere" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -189,7 +189,7 @@ class DATA_PT_sunsky(DataButtonsPanel, Panel): class DATA_PT_shadow(DataButtonsPanel, Panel): - bl_label = _("Shadow") + bl_label = "Shadow" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -304,7 +304,7 @@ class DATA_PT_shadow(DataButtonsPanel, Panel): class DATA_PT_area(DataButtonsPanel, Panel): - bl_label = _("Area Shape") + bl_label = "Area Shape" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -330,7 +330,7 @@ class DATA_PT_area(DataButtonsPanel, Panel): class DATA_PT_spot(DataButtonsPanel, Panel): - bl_label = _("Spot Shape") + bl_label = "Spot Shape" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -364,7 +364,7 @@ class DATA_PT_spot(DataButtonsPanel, Panel): class DATA_PT_falloff_curve(DataButtonsPanel, Panel): - bl_label = _("Falloff Curve") + bl_label = "Falloff Curve" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} diff --git a/release/scripts/startup/bl_ui/properties_data_lattice.py b/release/scripts/startup/bl_ui/properties_data_lattice.py index d77de212247..14d6ea66894 100644 --- a/release/scripts/startup/bl_ui/properties_data_lattice.py +++ b/release/scripts/startup/bl_ui/properties_data_lattice.py @@ -20,7 +20,7 @@ import bpy from bpy.types import Panel from rna_prop_ui import PropertyPanel -from blf import gettext as _ + class DataButtonsPanel(): bl_space_type = 'PROPERTIES' @@ -53,7 +53,7 @@ class DATA_PT_context_lattice(DataButtonsPanel, Panel): class DATA_PT_lattice(DataButtonsPanel, Panel): - bl_label = _("Lattice") + bl_label = "Lattice" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index d18cc4ea678..b74c89bb67e 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -38,7 +38,7 @@ class MESH_MT_vertex_group_specials(Menu): class MESH_MT_shape_key_specials(Menu): - bl_label = _("Shape Key Specials") + bl_label = "Shape Key Specials" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -81,7 +81,7 @@ class DATA_PT_context_mesh(MeshButtonsPanel, Panel): class DATA_PT_normals(MeshButtonsPanel, Panel): - bl_label = _("Normals") + bl_label = "Normals" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -101,7 +101,7 @@ class DATA_PT_normals(MeshButtonsPanel, Panel): class DATA_PT_texture_space(MeshButtonsPanel, Panel): - bl_label = _("Texture Space") + bl_label = "Texture Space" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -121,7 +121,7 @@ class DATA_PT_texture_space(MeshButtonsPanel, Panel): class DATA_PT_vertex_groups(MeshButtonsPanel, Panel): - bl_label = _("Vertex Groups") + bl_label = "Vertex Groups" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -170,7 +170,7 @@ class DATA_PT_vertex_groups(MeshButtonsPanel, Panel): class DATA_PT_shape_keys(MeshButtonsPanel, Panel): - bl_label = _("Shape Keys") + bl_label = "Shape Keys" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -263,7 +263,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel): class DATA_PT_uv_texture(MeshButtonsPanel, Panel): - bl_label = _("UV Texture") + bl_label = "UV Texture" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -286,7 +286,7 @@ class DATA_PT_uv_texture(MeshButtonsPanel, Panel): class DATA_PT_texface(MeshButtonsPanel, Panel): - bl_label = _("Texture Face") + bl_label = "Texture Face" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -333,7 +333,7 @@ class DATA_PT_texface(MeshButtonsPanel, Panel): class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): - bl_label = _("Vertex Colors") + bl_label = "Vertex Colors" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index 55a7314bc7b..693cb697544 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -50,7 +50,7 @@ class DATA_PT_context_metaball(DataButtonsPanel, Panel): class DATA_PT_metaball(DataButtonsPanel, Panel): - bl_label = _("Metaball") + bl_label = "Metaball" def draw(self, context): layout = self.layout @@ -74,7 +74,7 @@ class DATA_PT_metaball(DataButtonsPanel, Panel): class DATA_PT_mball_texture_space(DataButtonsPanel, Panel): - bl_label = _("Texture Space") + bl_label = "Texture Space" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -91,7 +91,7 @@ class DATA_PT_mball_texture_space(DataButtonsPanel, Panel): class DATA_PT_metaball_element(DataButtonsPanel, Panel): - bl_label = _("Active Element") + bl_label = "Active Element" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 8f1e1af4802..32324411669 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -28,7 +28,7 @@ class ModifierButtonsPanel(): class DATA_PT_modifiers(ModifierButtonsPanel, Panel): - bl_label = _("Modifiers") + bl_label = "Modifiers" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 52cdfc4ad00..95ae54c4597 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -28,7 +28,7 @@ class PhysicsButtonsPanel(): class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel): - bl_label = _("Physics") + bl_label = "Physics" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod @@ -169,7 +169,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel): class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel): - bl_label = _("Collision Bounds") + bl_label = "Collision Bounds" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod @@ -235,7 +235,7 @@ class RenderButtonsPanel(): class RENDER_PT_game(RenderButtonsPanel, Panel): - bl_label = _("Game") + bl_label = "Game" COMPAT_ENGINES = {'BLENDER_GAME'} def draw(self, context): @@ -247,7 +247,7 @@ class RENDER_PT_game(RenderButtonsPanel, Panel): class RENDER_PT_game_player(RenderButtonsPanel, Panel): - bl_label = _("Standalone Player") + bl_label = "Standalone Player" COMPAT_ENGINES = {'BLENDER_GAME'} def draw(self, context): @@ -280,7 +280,7 @@ class RENDER_PT_game_player(RenderButtonsPanel, Panel): class RENDER_PT_game_stereo(RenderButtonsPanel, Panel): - bl_label = _("Stereo") + bl_label = "Stereo" COMPAT_ENGINES = {'BLENDER_GAME'} def draw(self, context): @@ -334,7 +334,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, Panel): class RENDER_PT_game_shading(RenderButtonsPanel, Panel): - bl_label = _("Shading") + bl_label = "Shading" COMPAT_ENGINES = {'BLENDER_GAME'} def draw(self, context): @@ -360,7 +360,7 @@ class RENDER_PT_game_shading(RenderButtonsPanel, Panel): class RENDER_PT_game_performance(RenderButtonsPanel, Panel): - bl_label = _("Performance") + bl_label = "Performance" COMPAT_ENGINES = {'BLENDER_GAME'} def draw(self, context): @@ -376,7 +376,7 @@ class RENDER_PT_game_performance(RenderButtonsPanel, Panel): class RENDER_PT_game_display(RenderButtonsPanel, Panel): - bl_label = _("Display") + bl_label = "Display" COMPAT_ENGINES = {'BLENDER_GAME'} def draw(self, context): @@ -486,7 +486,7 @@ class WORLD_PT_game_context_world(WorldButtonsPanel, Panel): class WORLD_PT_game_world(WorldButtonsPanel, Panel): - bl_label = _("World") + bl_label = "World" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod @@ -505,7 +505,7 @@ class WORLD_PT_game_world(WorldButtonsPanel, Panel): class WORLD_PT_game_mist(WorldButtonsPanel, Panel): - bl_label = _("Mist") + bl_label = "Mist" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod @@ -531,7 +531,7 @@ class WORLD_PT_game_mist(WorldButtonsPanel, Panel): class WORLD_PT_game_physics(WorldButtonsPanel, Panel): - bl_label = _("Physics") + bl_label = "Physics" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 18eae572e94..dda6610933d 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -52,14 +52,14 @@ def simple_material(mat): class MATERIAL_MT_sss_presets(Menu): - bl_label = _("SSS Presets") + bl_label = "SSS Presets" preset_subdir = "sss" preset_operator = "script.execute_preset" draw = Menu.draw_preset class MATERIAL_MT_specials(Menu): - bl_label = _("Material Specials") + bl_label = "Material Specials" def draw(self, context): layout = self.layout @@ -146,7 +146,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): class MATERIAL_PT_preview(MaterialButtonsPanel, Panel): - bl_label = _("Preview") + bl_label = "Preview" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -154,7 +154,7 @@ class MATERIAL_PT_preview(MaterialButtonsPanel, Panel): class MATERIAL_PT_pipeline(MaterialButtonsPanel, Panel): - bl_label = _("Render Pipeline Options") + bl_label = "Render Pipeline Options" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -205,7 +205,7 @@ class MATERIAL_PT_pipeline(MaterialButtonsPanel, Panel): class MATERIAL_PT_diffuse(MaterialButtonsPanel, Panel): - bl_label = _("Diffuse") + bl_label = "Diffuse" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -262,7 +262,7 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel, Panel): class MATERIAL_PT_specular(MaterialButtonsPanel, Panel): - bl_label = _("Specular") + bl_label = "Specular" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -315,7 +315,7 @@ class MATERIAL_PT_specular(MaterialButtonsPanel, Panel): class MATERIAL_PT_shading(MaterialButtonsPanel, Panel): - bl_label = _("Shading") + bl_label = "Shading" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -349,7 +349,7 @@ class MATERIAL_PT_shading(MaterialButtonsPanel, Panel): class MATERIAL_PT_transp(MaterialButtonsPanel, Panel): - bl_label = _("Transparency") + bl_label = "Transparency" # bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -415,7 +415,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, Panel): class MATERIAL_PT_mirror(MaterialButtonsPanel, Panel): - bl_label = _("Mirror") + bl_label = "Mirror" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -473,7 +473,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel, Panel): class MATERIAL_PT_sss(MaterialButtonsPanel, Panel): - bl_label = _("Subsurface Scattering") + bl_label = "Subsurface Scattering" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -525,7 +525,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, Panel): class MATERIAL_PT_halo(MaterialButtonsPanel, Panel): - bl_label = _("Halo") + bl_label = "Halo" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -578,7 +578,7 @@ class MATERIAL_PT_halo(MaterialButtonsPanel, Panel): class MATERIAL_PT_flare(MaterialButtonsPanel, Panel): - bl_label = _("Flare") + bl_label = "Flare" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -613,7 +613,7 @@ class MATERIAL_PT_flare(MaterialButtonsPanel, Panel): class MATERIAL_PT_physics(MaterialButtonsPanel, Panel): - bl_label = _("Physics") + bl_label = "Physics" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod @@ -643,7 +643,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel, Panel): class MATERIAL_PT_strand(MaterialButtonsPanel, Panel): - bl_label = _("Strand") + bl_label = "Strand" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -690,7 +690,7 @@ class MATERIAL_PT_strand(MaterialButtonsPanel, Panel): class MATERIAL_PT_options(MaterialButtonsPanel, Panel): - bl_label = _("Options") + bl_label = "Options" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -739,7 +739,7 @@ class MATERIAL_PT_options(MaterialButtonsPanel, Panel): class MATERIAL_PT_shadow(MaterialButtonsPanel, Panel): - bl_label = _("Shadow") + bl_label = "Shadow" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -783,7 +783,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel, Panel): class MATERIAL_PT_transp_game(MaterialButtonsPanel, Panel): - bl_label = _("Transparency") + bl_label = "Transparency" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_GAME'} @@ -826,7 +826,7 @@ class VolumeButtonsPanel(): class MATERIAL_PT_volume_density(VolumeButtonsPanel, Panel): - bl_label = _("Density") + bl_label = "Density" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -840,7 +840,7 @@ class MATERIAL_PT_volume_density(VolumeButtonsPanel, Panel): class MATERIAL_PT_volume_shading(VolumeButtonsPanel, Panel): - bl_label = _("Shading") + bl_label = "Shading" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -865,7 +865,7 @@ class MATERIAL_PT_volume_shading(VolumeButtonsPanel, Panel): class MATERIAL_PT_volume_lighting(VolumeButtonsPanel, Panel): - bl_label = _("Lighting") + bl_label = "Lighting" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -900,7 +900,7 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel, Panel): class MATERIAL_PT_volume_transp(VolumeButtonsPanel, Panel): - bl_label = _("Transparency") + bl_label = "Transparency" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -918,7 +918,7 @@ class MATERIAL_PT_volume_transp(VolumeButtonsPanel, Panel): class MATERIAL_PT_volume_integration(VolumeButtonsPanel, Panel): - bl_label = _("Integration") + bl_label = "Integration" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -940,7 +940,7 @@ class MATERIAL_PT_volume_integration(VolumeButtonsPanel, Panel): class MATERIAL_PT_volume_options(VolumeButtonsPanel, Panel): - bl_label = _("Options") + bl_label = "Options" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} bl_options = {'DEFAULT_CLOSED'} diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 73a218704f7..a099189eed6 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -44,7 +44,7 @@ class OBJECT_PT_context_object(ObjectButtonsPanel, Panel): class OBJECT_PT_transform(ObjectButtonsPanel, Panel): - bl_label = _("Transform") + bl_label = "Transform" def draw(self, context): layout = self.layout @@ -70,7 +70,7 @@ class OBJECT_PT_transform(ObjectButtonsPanel, Panel): class OBJECT_PT_delta_transform(ObjectButtonsPanel, Panel): - bl_label = _("Delta Transform") + bl_label = "Delta Transform" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): @@ -96,7 +96,7 @@ class OBJECT_PT_delta_transform(ObjectButtonsPanel, Panel): class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel): - bl_label = _("Transform Locks") + bl_label = "Transform Locks" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): @@ -122,7 +122,7 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel): class OBJECT_PT_relations(ObjectButtonsPanel, Panel): - bl_label = _("Relations") + bl_label = "Relations" def draw(self, context): layout = self.layout @@ -149,7 +149,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, Panel): class OBJECT_PT_groups(ObjectButtonsPanel, Panel): - bl_label = _("Groups") + bl_label = "Groups" def draw(self, context): layout = self.layout @@ -188,7 +188,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel, Panel): class OBJECT_PT_display(ObjectButtonsPanel, Panel): - bl_label = _("Display") + bl_label = "Display" def draw(self, context): layout = self.layout @@ -222,7 +222,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): class OBJECT_PT_duplication(ObjectButtonsPanel, Panel): - bl_label = _("Duplication") + bl_label = "Duplication" def draw(self, context): layout = self.layout @@ -260,7 +260,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel): # XXX: the following options are all quite buggy, ancient hacks that should be dropped class OBJECT_PT_animation(ObjectButtonsPanel, Panel): - bl_label = _("Animation Hacks") + bl_label = "Animation Hacks" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py index 51544e63325..e7385d3926b 100644 --- a/release/scripts/startup/bl_ui/properties_object_constraint.py +++ b/release/scripts/startup/bl_ui/properties_object_constraint.py @@ -758,7 +758,7 @@ class ConstraintButtonsPanel(): class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel): - bl_label = _("Object Constraints") + bl_label = "Object Constraints" bl_context = "constraint" @classmethod @@ -782,7 +782,7 @@ class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel): class BONE_PT_constraints(ConstraintButtonsPanel, Panel): - bl_label = _("Bone Constraints") + bl_label = "Bone Constraints" bl_context = "bone_constraint" @classmethod diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 307f362a195..eb301ec8534 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -179,7 +179,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): class PARTICLE_PT_emission(ParticleButtonsPanel, Panel): - bl_label = _("Emission") + bl_label = "Emission" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -248,7 +248,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, Panel): class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): - bl_label = _("Hair dynamics") + bl_label = "Hair dynamics" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -304,7 +304,7 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): class PARTICLE_PT_cache(ParticleButtonsPanel, Panel): - bl_label = _("Cache") + bl_label = "Cache" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -330,7 +330,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, Panel): class PARTICLE_PT_velocity(ParticleButtonsPanel, Panel): - bl_label = _("Velocity") + bl_label = "Velocity" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -380,7 +380,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, Panel): class PARTICLE_PT_rotation(ParticleButtonsPanel, Panel): - bl_label = _("Rotation") + bl_label = "Rotation" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -429,7 +429,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, Panel): class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): - bl_label = _("Physics") + bl_label = "Physics" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -644,7 +644,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): - bl_label = _("Boid Brain") + bl_label = "Boid Brain" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -745,7 +745,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): class PARTICLE_PT_render(ParticleButtonsPanel, Panel): - bl_label = _("Render") + bl_label = "Render" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -930,7 +930,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): class PARTICLE_PT_draw(ParticleButtonsPanel, Panel): - bl_label = _("Display") + bl_label = "Display" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -992,7 +992,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, Panel): class PARTICLE_PT_children(ParticleButtonsPanel, Panel): - bl_label = _("Children") + bl_label = "Children" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -1092,7 +1092,7 @@ class PARTICLE_PT_children(ParticleButtonsPanel, Panel): class PARTICLE_PT_field_weights(ParticleButtonsPanel, Panel): - bl_label = _("Field Weights") + bl_label = "Field Weights" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -1113,7 +1113,7 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel, Panel): class PARTICLE_PT_force_fields(ParticleButtonsPanel, Panel): - bl_label = _("Force Field Settings") + bl_label = "Force Field Settings" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -1147,7 +1147,7 @@ class PARTICLE_PT_force_fields(ParticleButtonsPanel, Panel): class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): - bl_label = _("Vertexgroups") + bl_label = "Vertexgroups" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py index 5e42a465c2a..de74d1473c8 100644 --- a/release/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py @@ -35,7 +35,7 @@ class CLOTH_MT_presets(Menu): ''' Creates the menu items by scanning scripts/templates ''' - bl_label = _("Cloth Presets") + bl_label = "Cloth Presets" preset_subdir = "cloth" preset_operator = "script.execute_preset" draw = Menu.draw_preset @@ -54,7 +54,7 @@ class PhysicButtonsPanel(): class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel): - bl_label = _("Cloth") + bl_label = "Cloth" def draw(self, context): layout = self.layout @@ -119,7 +119,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel): class PHYSICS_PT_cloth_cache(PhysicButtonsPanel, Panel): - bl_label = _("Cloth Cache") + bl_label = "Cloth Cache" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -132,7 +132,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel, Panel): class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel): - bl_label = _("Cloth Collision") + bl_label = "Cloth Collision" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -173,7 +173,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel): class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, Panel): - bl_label = _("Cloth Stiffness Scaling") + bl_label = "Cloth Stiffness Scaling" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -209,7 +209,7 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, Panel): class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel, Panel): - bl_label = _("Cloth Field Weights") + bl_label = "Cloth Field Weights" bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py index 25c92c52311..937df5c0ad9 100644 --- a/release/scripts/startup/bl_ui/properties_physics_field.py +++ b/release/scripts/startup/bl_ui/properties_physics_field.py @@ -39,7 +39,7 @@ class PhysicButtonsPanel(): class PHYSICS_PT_field(PhysicButtonsPanel, Panel): - bl_label = _("Force Fields") + bl_label = "Force Fields" @classmethod def poll(cls, context): @@ -166,7 +166,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel, Panel): class PHYSICS_PT_collision(PhysicButtonsPanel, Panel): - bl_label = _("Collision") + bl_label = "Collision" #bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 775ad116846..c89d7ec9755 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -34,7 +34,7 @@ class PhysicButtonsPanel(): class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): - bl_label = _("Fluid") + bl_label = "Fluid" def draw(self, context): layout = self.layout @@ -188,7 +188,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel): - bl_label = _("Domain World") + bl_label = "Domain World" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -238,7 +238,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel): class PHYSICS_PT_domain_boundary(PhysicButtonsPanel, Panel): - bl_label = _("Domain Boundary") + bl_label = "Domain Boundary" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -267,7 +267,7 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel, Panel): class PHYSICS_PT_domain_particles(PhysicButtonsPanel, Panel): - bl_label = _("Domain Particles") + bl_label = "Domain Particles" bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 5dfe543c8a8..61c477b6d49 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -40,7 +40,7 @@ class PhysicButtonsPanel(): class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel): - bl_label = _("Smoke") + bl_label = "Smoke" def draw(self, context): layout = self.layout @@ -105,7 +105,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel): class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel): - bl_label = _("Smoke Groups") + bl_label = "Smoke Groups" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -133,7 +133,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel): class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel): - bl_label = _("Smoke High Resolution") + bl_label = "Smoke High Resolution" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -170,7 +170,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel): class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, Panel): - bl_label = _("Smoke Cache") + bl_label = "Smoke Cache" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -191,7 +191,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, Panel): class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, Panel): - bl_label = _("Smoke Field Weights") + bl_label = "Smoke Field Weights" bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py index 44778ffee5f..5449e54c6e6 100644 --- a/release/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py @@ -46,7 +46,7 @@ class PhysicButtonsPanel(): class PHYSICS_PT_softbody(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body") + bl_label = "Soft Body" def draw(self, context): layout = self.layout @@ -73,7 +73,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, Panel): class PHYSICS_PT_softbody_cache(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body Cache") + bl_label = "Soft Body Cache" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -86,7 +86,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel, Panel): class PHYSICS_PT_softbody_goal(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body Goal") + bl_label = "Soft Body Goal" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -129,7 +129,7 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel, Panel): class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body Edges") + bl_label = "Soft Body Edges" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -182,7 +182,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, Panel): class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body Self Collision") + bl_label = "Soft Body Self Collision" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -214,7 +214,7 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, Panel): class PHYSICS_PT_softbody_solver(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body Solver") + bl_label = "Soft Body Solver" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -250,7 +250,7 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel, Panel): class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, Panel): - bl_label = _("Soft Body Field Weights") + bl_label = "Soft Body Field Weights" bl_options = {'DEFAULT_CLOSED'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 981d539a4b5..1e9c15eedae 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -23,21 +23,21 @@ from blf import gettext as _ class RENDER_MT_presets(Menu): - bl_label = _("Render Presets") + bl_label = "Render Presets" preset_subdir = "render" preset_operator = "script.execute_preset" draw = Menu.draw_preset class RENDER_MT_ffmpeg_presets(Menu): - bl_label = _("FFMPEG Presets") + bl_label = "FFMPEG Presets" preset_subdir = "ffmpeg" preset_operator = "script.python_file_run" draw = Menu.draw_preset class RENDER_MT_framerate_presets(Menu): - bl_label = _("Frame Rate Presets") + bl_label = "Frame Rate Presets" preset_subdir = "framerate" preset_operator = "script.execute_preset" draw = Menu.draw_preset @@ -56,7 +56,7 @@ class RenderButtonsPanel(): class RENDER_PT_render(RenderButtonsPanel, Panel): - bl_label = _("Render") + bl_label = "Render" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -72,7 +72,7 @@ class RENDER_PT_render(RenderButtonsPanel, Panel): class RENDER_PT_layers(RenderButtonsPanel, Panel): - bl_label = _("Layers") + bl_label = "Layers" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -176,7 +176,7 @@ class RENDER_PT_layers(RenderButtonsPanel, Panel): class RENDER_PT_dimensions(RenderButtonsPanel, Panel): - bl_label = _("Dimensions") + bl_label = "Dimensions" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -212,9 +212,9 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): col = split.column() sub = col.column(align=True) sub.label(text=_("Frame Range:")) - sub.prop(scene, "frame_start", text=_("Start")) - sub.prop(scene, "frame_end", text=_("End")) - sub.prop(scene, "frame_step", text=_("Step")) + sub.prop(scene, "frame_start") + sub.prop(scene, "frame_end") + sub.prop(scene, "frame_step") sub.label(text=_("Frame Rate:")) if rd.fps_base == 1: @@ -243,7 +243,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): class RENDER_PT_antialiasing(RenderButtonsPanel, Panel): - bl_label = _("Anti-Aliasing") + bl_label = "Anti-Aliasing" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): @@ -271,7 +271,7 @@ class RENDER_PT_antialiasing(RenderButtonsPanel, Panel): class RENDER_PT_motion_blur(RenderButtonsPanel, Panel): - bl_label = _("Sampled Motion Blur") + bl_label = "Sampled Motion Blur" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -297,7 +297,7 @@ class RENDER_PT_motion_blur(RenderButtonsPanel, Panel): class RENDER_PT_shading(RenderButtonsPanel, Panel): - bl_label = _("Shading") + bl_label = "Shading" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -321,7 +321,7 @@ class RENDER_PT_shading(RenderButtonsPanel, Panel): class RENDER_PT_performance(RenderButtonsPanel, Panel): - bl_label = _("Performance") + bl_label = "Performance" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -364,7 +364,7 @@ class RENDER_PT_performance(RenderButtonsPanel, Panel): class RENDER_PT_post_processing(RenderButtonsPanel, Panel): - bl_label = _("Post Processing") + bl_label = "Post Processing" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -401,7 +401,7 @@ class RENDER_PT_post_processing(RenderButtonsPanel, Panel): class RENDER_PT_stamp(RenderButtonsPanel, Panel): - bl_label = _("Stamp") + bl_label = "Stamp" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -446,7 +446,7 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel): class RENDER_PT_output(RenderButtonsPanel, Panel): - bl_label = _("Output") + bl_label = "Output" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -546,7 +546,7 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): class RENDER_PT_encoding(RenderButtonsPanel, Panel): - bl_label = _("Encoding") + bl_label = "Encoding" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -599,7 +599,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): class RENDER_PT_bake(RenderButtonsPanel, Panel): - bl_label = _("Bake") + bl_label = "Bake" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 11e20a8cd2a..9735ff5c01b 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -33,7 +33,7 @@ class SceneButtonsPanel(): class SCENE_PT_scene(SceneButtonsPanel, Panel): - bl_label = _("Scene") + bl_label = "Scene" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -45,7 +45,7 @@ class SCENE_PT_scene(SceneButtonsPanel, Panel): class SCENE_PT_audio(SceneButtonsPanel, Panel): - bl_label = _("Audio") + bl_label = "Audio" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -73,7 +73,7 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel): class SCENE_PT_unit(SceneButtonsPanel, Panel): - bl_label = _("Units") + bl_label = "Units" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -91,7 +91,7 @@ class SCENE_PT_unit(SceneButtonsPanel, Panel): class SCENE_PT_keying_sets(SceneButtonsPanel, Panel): - bl_label = _("Keying Sets") + bl_label = "Keying Sets" def draw(self, context): layout = self.layout @@ -124,7 +124,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, Panel): class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel): - bl_label = _("Active Keying Set") + bl_label = "Active Keying Set" @classmethod def poll(cls, context): @@ -174,7 +174,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel): class SCENE_PT_physics(SceneButtonsPanel, Panel): - bl_label = _("Gravity") + bl_label = "Gravity" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): @@ -191,7 +191,7 @@ class SCENE_PT_physics(SceneButtonsPanel, Panel): class SCENE_PT_simplify(SceneButtonsPanel, Panel): - bl_label = _("Simplify") + bl_label = "Simplify" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): @@ -230,12 +230,12 @@ class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): class ANIM_OT_keying_set_export(Operator): "Export Keying Set to a python script." bl_idname = "anim.keying_set_export" - bl_label = _("Export Keying Set...") + bl_label = "Export Keying Set..." - filepath = bpy.props.StringProperty(name=_("File Path"), description=_("Filepath to write file to.")) - filter_folder = bpy.props.BoolProperty(name=_("Filter folders"), description="", default=True, options={'HIDDEN'}) - filter_text = bpy.props.BoolProperty(name=_("Filter text"), description="", default=True, options={'HIDDEN'}) - filter_python = bpy.props.BoolProperty(name=_("Filter python"), description="", default=True, options={'HIDDEN'}) + filepath = bpy.props.StringProperty(name="File Path", description="Filepath to write file to.") + filter_folder = bpy.props.BoolProperty(name="Filter folders", description="", default=True, options={'HIDDEN'}) + filter_text = bpy.props.BoolProperty(name="Filter text", description="", default=True, options={'HIDDEN'}) + filter_python = bpy.props.BoolProperty(name="Filter python", description="", default=True, options={'HIDDEN'}) def execute(self, context): if not self.filepath: diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index c80f3fa76d3..c5f8708040f 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -24,7 +24,7 @@ from blf import gettext as _ class TEXTURE_MT_specials(Menu): - bl_label = _("Texture Specials") + bl_label = "Texture Specials" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -35,7 +35,7 @@ class TEXTURE_MT_specials(Menu): class TEXTURE_MT_envmap_specials(Menu): - bl_label = _("Environment Map Specials") + bl_label = "Environment Map Specials" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -153,7 +153,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel): class TEXTURE_PT_preview(TextureButtonsPanel, Panel): - bl_label = _("Preview") + bl_label = "Preview" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -170,7 +170,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel, Panel): class TEXTURE_PT_colors(TextureButtonsPanel, Panel): - bl_label = _("Colors") + bl_label = "Colors" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -226,7 +226,7 @@ class TextureTypePanel(TextureButtonsPanel): class TEXTURE_PT_clouds(TextureTypePanel, Panel): - bl_label = _("Clouds") + bl_label = "Clouds" tex_type = 'CLOUDS' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -250,7 +250,7 @@ class TEXTURE_PT_clouds(TextureTypePanel, Panel): class TEXTURE_PT_wood(TextureTypePanel, Panel): - bl_label = _("Wood") + bl_label = "Wood" tex_type = 'WOOD' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -279,7 +279,7 @@ class TEXTURE_PT_wood(TextureTypePanel, Panel): class TEXTURE_PT_marble(TextureTypePanel, Panel): - bl_label = _("Marble") + bl_label = "Marble" tex_type = 'MARBLE' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -306,7 +306,7 @@ class TEXTURE_PT_marble(TextureTypePanel, Panel): class TEXTURE_PT_magic(TextureTypePanel, Panel): - bl_label = _("Magic") + bl_label = "Magic" tex_type = 'MAGIC' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -321,7 +321,7 @@ class TEXTURE_PT_magic(TextureTypePanel, Panel): class TEXTURE_PT_blend(TextureTypePanel, Panel): - bl_label = _("Blend") + bl_label = "Blend" tex_type = 'BLEND' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -339,7 +339,7 @@ class TEXTURE_PT_blend(TextureTypePanel, Panel): class TEXTURE_PT_stucci(TextureTypePanel, Panel): - bl_label = _("Stucci") + bl_label = "Stucci" tex_type = 'STUCCI' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -359,7 +359,7 @@ class TEXTURE_PT_stucci(TextureTypePanel, Panel): class TEXTURE_PT_image(TextureTypePanel, Panel): - bl_label = _("Image") + bl_label = "Image" tex_type = 'IMAGE' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -385,7 +385,7 @@ def texture_filter_common(tex, layout): class TEXTURE_PT_image_sampling(TextureTypePanel, Panel): - bl_label = _("Image Sampling") + bl_label = "Image Sampling" bl_options = {'DEFAULT_CLOSED'} tex_type = 'IMAGE' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -430,7 +430,7 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel): class TEXTURE_PT_image_mapping(TextureTypePanel, Panel): - bl_label = _("Image Mapping") + bl_label = "Image Mapping" bl_options = {'DEFAULT_CLOSED'} tex_type = 'IMAGE' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -486,7 +486,7 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, Panel): class TEXTURE_PT_envmap(TextureTypePanel, Panel): - bl_label = _("Environment Map") + bl_label = "Environment Map" tex_type = 'ENVIRONMENT_MAP' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -524,7 +524,7 @@ class TEXTURE_PT_envmap(TextureTypePanel, Panel): class TEXTURE_PT_envmap_sampling(TextureTypePanel, Panel): - bl_label = _("Environment Map Sampling") + bl_label = "Environment Map Sampling" bl_options = {'DEFAULT_CLOSED'} tex_type = 'ENVIRONMENT_MAP' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -538,7 +538,7 @@ class TEXTURE_PT_envmap_sampling(TextureTypePanel, Panel): class TEXTURE_PT_musgrave(TextureTypePanel, Panel): - bl_label = _("Musgrave") + bl_label = "Musgrave" tex_type = 'MUSGRAVE' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -575,7 +575,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, Panel): class TEXTURE_PT_voronoi(TextureTypePanel, Panel): - bl_label = _("Voronoi") + bl_label = "Voronoi" tex_type = 'VORONOI' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -611,7 +611,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel, Panel): class TEXTURE_PT_distortednoise(TextureTypePanel, Panel): - bl_label = _("Distorted Noise") + bl_label = "Distorted Noise" tex_type = 'DISTORTED_NOISE' COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @@ -633,7 +633,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel, Panel): class TEXTURE_PT_voxeldata(TextureButtonsPanel, Panel): - bl_label = _("Voxel Data") + bl_label = "Voxel Data" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -673,7 +673,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, Panel): class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel): - bl_label = _("Point Density") + bl_label = "Point Density" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -739,7 +739,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel): class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, Panel): - bl_label = _("Turbulence") + bl_label = "Turbulence" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -776,7 +776,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, Panel): class TEXTURE_PT_mapping(TextureSlotPanel, Panel): - bl_label = _("Mapping") + bl_label = "Mapping" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod @@ -864,7 +864,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel): class TEXTURE_PT_influence(TextureSlotPanel, Panel): - bl_label = _("Influence") + bl_label = "Influence" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 07df2ff53ec..916667ea400 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -64,7 +64,7 @@ class WORLD_PT_context_world(WorldButtonsPanel, Panel): class WORLD_PT_preview(WorldButtonsPanel, Panel): - bl_label = _("Preview") + bl_label = "Preview" COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod @@ -77,7 +77,7 @@ class WORLD_PT_preview(WorldButtonsPanel, Panel): class WORLD_PT_world(WorldButtonsPanel, Panel): - bl_label = _("World") + bl_label = "World" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -102,7 +102,7 @@ class WORLD_PT_world(WorldButtonsPanel, Panel): class WORLD_PT_ambient_occlusion(WorldButtonsPanel, Panel): - bl_label = _("Ambient Occlusion") + bl_label = "Ambient Occlusion" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): @@ -140,7 +140,7 @@ class WORLD_PT_environment_lighting(WorldButtonsPanel, Panel): class WORLD_PT_indirect_lighting(WorldButtonsPanel, Panel): - bl_label = _("Indirect Lighting") + bl_label = "Indirect Lighting" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): @@ -162,7 +162,7 @@ class WORLD_PT_indirect_lighting(WorldButtonsPanel, Panel): class WORLD_PT_gather(WorldButtonsPanel, Panel): - bl_label = _("Gather") + bl_label = "Gather" COMPAT_ENGINES = {'BLENDER_RENDER'} def draw(self, context): @@ -210,7 +210,7 @@ class WORLD_PT_gather(WorldButtonsPanel, Panel): class WORLD_PT_mist(WorldButtonsPanel, Panel): - bl_label = _("Mist") + bl_label = "Mist" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -239,7 +239,7 @@ class WORLD_PT_mist(WorldButtonsPanel, Panel): class WORLD_PT_stars(WorldButtonsPanel, Panel): - bl_label = _("Stars") + bl_label = "Stars" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} diff --git a/release/scripts/startup/bl_ui/space_console.py b/release/scripts/startup/bl_ui/space_console.py index fae5f1d313d..bb0cf6eda2c 100644 --- a/release/scripts/startup/bl_ui/space_console.py +++ b/release/scripts/startup/bl_ui/space_console.py @@ -38,7 +38,7 @@ class CONSOLE_HT_header(Header): class CONSOLE_MT_console(Menu): - bl_label = _("Console") + bl_label = "Console" def draw(self, context): layout = self.layout @@ -55,7 +55,7 @@ class CONSOLE_MT_console(Menu): class CONSOLE_MT_language(Menu): - bl_label = _("Languages...") + bl_label = "Languages..." def draw(self, context): import sys @@ -84,7 +84,7 @@ def add_scrollback(text, text_type): class ConsoleExec(Operator): '''Execute the current console line as a python expression''' bl_idname = "console.execute" - bl_label = _("Console Execute") + bl_label = "Console Execute" def execute(self, context): sc = context.space_data @@ -102,7 +102,7 @@ class ConsoleExec(Operator): class ConsoleAutocomplete(Operator): '''Evaluate the namespace up until the cursor and give a list of options or complete the name if there is only one''' bl_idname = "console.autocomplete" - bl_label = _("Console Autocomplete") + bl_label = "Console Autocomplete" def execute(self, context): sc = context.space_data @@ -119,7 +119,7 @@ class ConsoleAutocomplete(Operator): class ConsoleBanner(Operator): '''Print a message whem the terminal initializes''' bl_idname = "console.banner" - bl_label = _("Console Banner") + bl_label = "Console Banner" def execute(self, context): sc = context.space_data @@ -141,10 +141,10 @@ class ConsoleBanner(Operator): class ConsoleLanguage(Operator): '''Set the current language for this console''' bl_idname = "console.language" - bl_label = _("Console Language") + bl_label = "Console Language" language = StringProperty( - name=_("Language"), + name="Language", maxlen=32, ) diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 06905d1505a..580a4e7f1b6 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -140,7 +140,7 @@ class DOPESHEET_HT_header(Header): class DOPESHEET_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -174,7 +174,7 @@ class DOPESHEET_MT_view(Menu): class DOPESHEET_MT_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -209,7 +209,7 @@ class DOPESHEET_MT_select(Menu): class DOPESHEET_MT_marker(Menu): - bl_label = _("Marker") + bl_label = "Marker" def draw(self, context): layout = self.layout @@ -239,7 +239,7 @@ class DOPESHEET_MT_marker(Menu): # Keyframe Editing class DOPESHEET_MT_channel(Menu): - bl_label = _("Channel") + bl_label = "Channel" def draw(self, context): layout = self.layout @@ -269,7 +269,7 @@ class DOPESHEET_MT_channel(Menu): class DOPESHEET_MT_key(Menu): - bl_label = _("Key") + bl_label = "Key" def draw(self, context): layout = self.layout @@ -301,7 +301,7 @@ class DOPESHEET_MT_key(Menu): class DOPESHEET_MT_key_transform(Menu): - bl_label = _("Transform") + bl_label = "Transform" def draw(self, context): layout = self.layout @@ -316,7 +316,7 @@ class DOPESHEET_MT_key_transform(Menu): # Grease Pencil Editing class DOPESHEET_MT_gpencil_channel(Menu): - bl_label = _("Channel") + bl_label = "Channel" def draw(self, context): layout = self.layout @@ -343,7 +343,7 @@ class DOPESHEET_MT_gpencil_channel(Menu): class DOPESHEET_MT_gpencil_frame(Menu): - bl_label = _("Frame") + bl_label = "Frame" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 7048d5febf8..fd50d60bd45 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -62,7 +62,7 @@ class GRAPH_HT_header(Header): class GRAPH_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -106,7 +106,7 @@ class GRAPH_MT_view(Menu): class GRAPH_MT_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -140,7 +140,7 @@ class GRAPH_MT_select(Menu): class GRAPH_MT_marker(Menu): - bl_label = _("Marker") + bl_label = "Marker" def draw(self, context): layout = self.layout @@ -160,7 +160,7 @@ class GRAPH_MT_marker(Menu): class GRAPH_MT_channel(Menu): - bl_label = _("Channel") + bl_label = "Channel" def draw(self, context): layout = self.layout @@ -191,7 +191,7 @@ class GRAPH_MT_channel(Menu): class GRAPH_MT_key(Menu): - bl_label = _("Key") + bl_label = "Key" def draw(self, context): layout = self.layout @@ -229,7 +229,7 @@ class GRAPH_MT_key(Menu): class GRAPH_MT_key_transform(Menu): - bl_label = _("Transform") + bl_label = "Transform" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 0f23802a401..f5be25d14f6 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -34,7 +34,7 @@ class BrushButtonsPanel(): class IMAGE_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -82,7 +82,7 @@ class IMAGE_MT_view(Menu): class IMAGE_MT_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -103,7 +103,7 @@ class IMAGE_MT_select(Menu): class IMAGE_MT_image(Menu): - bl_label = _("Image") + bl_label = "Image" def draw(self, context): layout = self.layout @@ -154,7 +154,7 @@ class IMAGE_MT_image(Menu): class IMAGE_MT_image_invert(Menu): - bl_label = _("Invert") + bl_label = "Invert" def draw(self, context): layout = self.layout @@ -180,7 +180,7 @@ class IMAGE_MT_image_invert(Menu): class IMAGE_MT_uvs_showhide(Menu): - bl_label = _("Show/Hide Faces") + bl_label = "Show/Hide Faces" def draw(self, context): layout = self.layout @@ -191,7 +191,7 @@ class IMAGE_MT_uvs_showhide(Menu): class IMAGE_MT_uvs_transform(Menu): - bl_label = _("Transform") + bl_label = "Transform" def draw(self, context): layout = self.layout @@ -206,7 +206,7 @@ class IMAGE_MT_uvs_transform(Menu): class IMAGE_MT_uvs_snap(Menu): - bl_label = _("Snap") + bl_label = "Snap" def draw(self, context): layout = self.layout @@ -223,7 +223,7 @@ class IMAGE_MT_uvs_snap(Menu): class IMAGE_MT_uvs_mirror(Menu): - bl_label = _("Mirror") + bl_label = "Mirror" def draw(self, context): layout = self.layout @@ -234,7 +234,7 @@ class IMAGE_MT_uvs_mirror(Menu): class IMAGE_MT_uvs_weldalign(Menu): - bl_label = _("Weld/Align") + bl_label = "Weld/Align" def draw(self, context): layout = self.layout @@ -289,7 +289,7 @@ class IMAGE_MT_uvs(Menu): class IMAGE_MT_uvs_select_mode(Menu): - bl_label = _("UV Select Mode") + bl_label = "UV Select Mode" def draw(self, context): layout = self.layout @@ -417,7 +417,7 @@ class IMAGE_HT_header(Header): class IMAGE_PT_image_properties(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' - bl_label = _("Image") + bl_label = "Image" @classmethod def poll(cls, context): @@ -436,7 +436,7 @@ class IMAGE_PT_image_properties(Panel): class IMAGE_PT_game_properties(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' - bl_label = _("Game Properties") + bl_label = "Game Properties" @classmethod def poll(cls, context): @@ -478,7 +478,7 @@ class IMAGE_PT_game_properties(Panel): class IMAGE_PT_view_histogram(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' - bl_label = _("Histogram") + bl_label = "Histogram" @classmethod def poll(cls, context): @@ -497,7 +497,7 @@ class IMAGE_PT_view_histogram(Panel): class IMAGE_PT_view_waveform(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' - bl_label = _("Waveform") + bl_label = "Waveform" @classmethod def poll(cls, context): @@ -518,7 +518,7 @@ class IMAGE_PT_view_waveform(Panel): class IMAGE_PT_view_vectorscope(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' - bl_label = _("Vectorscope") + bl_label = "Vectorscope" @classmethod def poll(cls, context): @@ -536,7 +536,7 @@ class IMAGE_PT_view_vectorscope(Panel): class IMAGE_PT_sample_line(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' - bl_label = _("Sample Line") + bl_label = "Sample Line" @classmethod def poll(cls, context): @@ -556,7 +556,7 @@ class IMAGE_PT_sample_line(Panel): class IMAGE_PT_scope_sample(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' - bl_label = _("Scope Samples") + bl_label = "Scope Samples" @classmethod def poll(cls, context): @@ -578,7 +578,7 @@ class IMAGE_PT_scope_sample(Panel): class IMAGE_PT_view_properties(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' - bl_label = _("Display") + bl_label = "Display" @classmethod def poll(cls, context): @@ -637,7 +637,7 @@ class IMAGE_PT_view_properties(Panel): class IMAGE_PT_paint(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' - bl_label = _("Paint") + bl_label = "Paint" @classmethod def poll(cls, context): @@ -679,7 +679,7 @@ class IMAGE_PT_paint(Panel): class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel): - bl_label = _("Texture") + bl_label = "Texture" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): @@ -694,7 +694,7 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel): class IMAGE_PT_tools_brush_tool(BrushButtonsPanel, Panel): - bl_label = _("Tool") + bl_label = "Tool" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): @@ -712,7 +712,7 @@ class IMAGE_PT_tools_brush_tool(BrushButtonsPanel, Panel): class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel): - bl_label = _("Paint Stroke") + bl_label = "Paint Stroke" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): @@ -736,7 +736,7 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel): class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel): - bl_label = _("Paint Curve") + bl_label = "Paint Curve" bl_options = {'DEFAULT_CLOSED'} def draw(self, context): diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index 416defb3bf5..99ee24406ac 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -89,7 +89,7 @@ class INFO_HT_header(Header): class INFO_MT_report(Menu): - bl_label = _("Report") + bl_label = "Report" def draw(self, context): layout = self.layout @@ -101,7 +101,7 @@ class INFO_MT_report(Menu): class INFO_MT_file(Menu): - bl_label = _("File"); + bl_label = "File" def draw(self, context): layout = self.layout @@ -156,7 +156,7 @@ class INFO_MT_file(Menu): class INFO_MT_file_import(Menu): bl_idname = "INFO_MT_file_import" - bl_label = _("Import") + bl_label = "Import" def draw(self, context): if hasattr(bpy.types, "WM_OT_collada_import"): @@ -165,7 +165,7 @@ class INFO_MT_file_import(Menu): class INFO_MT_file_export(Menu): bl_idname = "INFO_MT_file_export" - bl_label = _("Export") + bl_label = "Export" def draw(self, context): if hasattr(bpy.types, "WM_OT_collada_export"): @@ -173,7 +173,7 @@ class INFO_MT_file_export(Menu): class INFO_MT_file_external_data(Menu): - bl_label = _("External Data") + bl_label = "External Data" def draw(self, context): layout = self.layout @@ -191,7 +191,7 @@ class INFO_MT_file_external_data(Menu): class INFO_MT_mesh_add(Menu): bl_idname = "INFO_MT_mesh_add" - bl_label = _("Mesh") + bl_label = "Mesh" def draw(self, context): layout = self.layout @@ -212,7 +212,7 @@ class INFO_MT_mesh_add(Menu): class INFO_MT_curve_add(Menu): bl_idname = "INFO_MT_curve_add" - bl_label = _("Curve") + bl_label = "Curve" def draw(self, context): layout = self.layout @@ -227,7 +227,7 @@ class INFO_MT_curve_add(Menu): class INFO_MT_edit_curve_add(Menu): bl_idname = "INFO_MT_edit_curve_add" - bl_label = _("Add") + bl_label = "Add" def draw(self, context): is_surf = context.active_object.type == 'SURFACE' @@ -243,7 +243,7 @@ class INFO_MT_edit_curve_add(Menu): class INFO_MT_surface_add(Menu): bl_idname = "INFO_MT_surface_add" - bl_label = _("Surface") + bl_label = "Surface" def draw(self, context): layout = self.layout @@ -259,7 +259,7 @@ class INFO_MT_surface_add(Menu): class INFO_MT_armature_add(Menu): bl_idname = "INFO_MT_armature_add" - bl_label = _("Armature") + bl_label = "Armature" def draw(self, context): layout = self.layout @@ -269,7 +269,7 @@ class INFO_MT_armature_add(Menu): class INFO_MT_add(Menu): - bl_label = _("Add") + bl_label = "Add" def draw(self, context): layout = self.layout @@ -312,7 +312,7 @@ class INFO_MT_add(Menu): class INFO_MT_game(Menu): - bl_label = _("Game") + bl_label = "Game" def draw(self, context): layout = self.layout @@ -333,7 +333,7 @@ class INFO_MT_game(Menu): class INFO_MT_render(Menu): - bl_label = _("Render") + bl_label = "Render" def draw(self, context): layout = self.layout @@ -353,7 +353,7 @@ class INFO_MT_render(Menu): class INFO_MT_help(Menu): - bl_label = _("Help") + bl_label = "Help" def draw(self, context): import sys @@ -390,7 +390,7 @@ class INFO_MT_help(Menu): class HELP_OT_operator_cheat_sheet(Operator): bl_idname = "help.operator_cheat_sheet" - bl_label = _("Operator Cheat Sheet") + bl_label = "Operator Cheat Sheet" def execute(self, context): op_strings = [] diff --git a/release/scripts/startup/bl_ui/space_logic.py b/release/scripts/startup/bl_ui/space_logic.py index 38b63823ff3..b1149913d17 100644 --- a/release/scripts/startup/bl_ui/space_logic.py +++ b/release/scripts/startup/bl_ui/space_logic.py @@ -25,7 +25,7 @@ from blf import gettext as _ class LOGIC_PT_properties(Panel): bl_space_type = 'LOGIC_EDITOR' bl_region_type = 'UI' - bl_label = _("Properties") + bl_label = "Properties" @classmethod def poll(cls, context): @@ -52,7 +52,7 @@ class LOGIC_PT_properties(Panel): class LOGIC_MT_logicbricks_add(Menu): - bl_label = _("Add") + bl_label = "Add" def draw(self, context): layout = self.layout @@ -75,7 +75,7 @@ class LOGIC_HT_header(Header): class LOGIC_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index aa8dc337c39..8a4b0a61291 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -49,7 +49,7 @@ class NLA_HT_header(Header): class NLA_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -81,7 +81,7 @@ class NLA_MT_view(Menu): class NLA_MT_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -118,7 +118,7 @@ class NLA_MT_marker(Menu): class NLA_MT_edit(Menu): - bl_label = _("Edit") + bl_label = "Edit" def draw(self, context): layout = self.layout @@ -160,7 +160,7 @@ class NLA_MT_edit(Menu): class NLA_MT_add(Menu): - bl_label = _("Add") + bl_label = "Add" def draw(self, context): layout = self.layout @@ -179,7 +179,7 @@ class NLA_MT_add(Menu): class NLA_MT_edit_transform(Menu): - bl_label = _("Transform") + bl_label = "Transform" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 6a58fc143fa..0808ddf769a 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -75,7 +75,7 @@ class NODE_HT_header(Header): class NODE_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -104,7 +104,7 @@ class NODE_MT_view(Menu): class NODE_MT_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -121,7 +121,7 @@ class NODE_MT_select(Menu): class NODE_MT_node(Menu): - bl_label = _("Node") + bl_label = "Node" def draw(self, context): layout = self.layout @@ -164,7 +164,7 @@ class NODE_MT_node(Menu): class NODE_PT_properties(Panel): bl_space_type = 'NODE_EDITOR' bl_region_type = 'UI' - bl_label = _("Backdrop") + bl_label = "Backdrop" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index b3be568cf68..b1e6eaf3245 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -19,7 +19,6 @@ # import bpy from bpy.types import Header, Menu -from blf import gettext as _ class OUTLINER_HT_header(Header): @@ -66,7 +65,7 @@ class OUTLINER_HT_header(Header): class OUTLINER_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -88,7 +87,7 @@ class OUTLINER_MT_view(Menu): class OUTLINER_MT_search(Menu): - bl_label = _("Search") + bl_label = "Search" def draw(self, context): layout = self.layout @@ -100,7 +99,7 @@ class OUTLINER_MT_search(Menu): class OUTLINER_MT_edit_datablocks(Menu): - bl_label = _("Edit") + bl_label = "Edit" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index ddbbc08eb46..a9a5eae3179 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -79,7 +79,7 @@ class SEQUENCER_HT_header(Header): class SEQUENCER_MT_view_toggle(Menu): - bl_label = _("View Type") + bl_label = "View Type" def draw(self, context): layout = self.layout @@ -90,7 +90,7 @@ class SEQUENCER_MT_view_toggle(Menu): class SEQUENCER_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -134,7 +134,7 @@ class SEQUENCER_MT_view(Menu): class SEQUENCER_MT_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -152,7 +152,7 @@ class SEQUENCER_MT_select(Menu): class SEQUENCER_MT_marker(Menu): - bl_label = _("Marker") + bl_label = "Marker" def draw(self, context): layout = self.layout @@ -172,7 +172,7 @@ class SEQUENCER_MT_marker(Menu): class SEQUENCER_MT_change(Menu): - bl_label = _("Change") + bl_label = "Change" def draw(self, context): layout = self.layout @@ -185,7 +185,7 @@ class SEQUENCER_MT_change(Menu): class SEQUENCER_MT_add(Menu): - bl_label = _("Add") + bl_label = "Add" def draw(self, context): layout = self.layout @@ -205,7 +205,7 @@ class SEQUENCER_MT_add(Menu): class SEQUENCER_MT_add_effect(Menu): - bl_label = _("Effect Strip...") + bl_label = "Effect Strip..." def draw(self, context): layout = self.layout @@ -230,7 +230,7 @@ class SEQUENCER_MT_add_effect(Menu): class SEQUENCER_MT_strip(Menu): - bl_label = _("Strip") + bl_label = "Strip" def draw(self, context): layout = self.layout @@ -336,7 +336,7 @@ class SequencerButtonsPanel_Output(): class SEQUENCER_PT_edit(SequencerButtonsPanel, Panel): - bl_label = _("Edit Strip") + bl_label = "Edit Strip" def draw(self, context): layout = self.layout @@ -394,7 +394,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, Panel): class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): - bl_label = _("Effect Strip") + bl_label = "Effect Strip" @classmethod def poll(cls, context): @@ -532,7 +532,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): - bl_label = _("Strip Input") + bl_label = "Strip Input" @classmethod def poll(cls, context): @@ -617,7 +617,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel): - bl_label = _("Sound") + bl_label = "Sound" @classmethod def poll(cls, context): @@ -660,7 +660,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel): class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): - bl_label = _("Scene") + bl_label = "Scene" @classmethod def poll(cls, context): @@ -694,7 +694,7 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): - bl_label = _("Filter") + bl_label = "Filter" @classmethod def poll(cls, context): @@ -756,7 +756,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): - bl_label = _("Proxy / Timecode") + bl_label = "Proxy / Timecode" @classmethod def poll(cls, context): @@ -831,7 +831,7 @@ class SEQUENCER_PT_preview(SequencerButtonsPanel_Output, Panel): class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel): - bl_label = _("View Settings") + bl_label = "View Settings" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 03baf8f34ca..cd72d42857b 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -79,7 +79,7 @@ class TEXT_HT_header(Header): class TEXT_PT_properties(Panel): bl_space_type = 'TEXT_EDITOR' bl_region_type = 'UI' - bl_label = _("Properties") + bl_label = "Properties" def draw(self, context): layout = self.layout @@ -110,7 +110,7 @@ class TEXT_PT_properties(Panel): class TEXT_PT_find(Panel): bl_space_type = 'TEXT_EDITOR' bl_region_type = 'UI' - bl_label = _("Find") + bl_label = "Find" def draw(self, context): layout = self.layout @@ -142,7 +142,7 @@ class TEXT_PT_find(Panel): class TEXT_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -165,7 +165,7 @@ class TEXT_MT_view(Menu): class TEXT_MT_text(Menu): - bl_label = _("Text") + bl_label = "Text" def draw(self, context): layout = self.layout @@ -193,7 +193,7 @@ class TEXT_MT_text(Menu): class TEXT_MT_templates(Menu): - bl_label = _("Templates") + bl_label = "Templates" def draw(self, context): self.path_menu(bpy.utils.script_paths("templates"), @@ -203,7 +203,7 @@ class TEXT_MT_templates(Menu): class TEXT_MT_edit_select(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -213,7 +213,7 @@ class TEXT_MT_edit_select(Menu): class TEXT_MT_edit_markers(Menu): - bl_label = _("Markers") + bl_label = "Markers" def draw(self, context): layout = self.layout @@ -224,7 +224,7 @@ class TEXT_MT_edit_markers(Menu): class TEXT_MT_format(Menu): - bl_label = _("Format") + bl_label = "Format" def draw(self, context): layout = self.layout @@ -243,7 +243,7 @@ class TEXT_MT_format(Menu): class TEXT_MT_edit_to3d(Menu): - bl_label = _("Text To 3D Object") + bl_label = "Text To 3D Object" def draw(self, context): layout = self.layout @@ -257,7 +257,7 @@ class TEXT_MT_edit_to3d(Menu): class TEXT_MT_edit(Menu): - bl_label = _("Edit") + bl_label = "Edit" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 157fe9939e8..d654c1e4d8b 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -93,7 +93,7 @@ class TIME_HT_header(Header): class TIME_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -118,7 +118,7 @@ class TIME_MT_view(Menu): class TIME_MT_cache(Menu): - bl_label = _("Cache") + bl_label = "Cache" def draw(self, context): layout = self.layout @@ -138,7 +138,7 @@ class TIME_MT_cache(Menu): class TIME_MT_frame(Menu): - bl_label = _("Frame") + bl_label = "Frame" def draw(self, context): layout = self.layout @@ -164,7 +164,7 @@ class TIME_MT_frame(Menu): class TIME_MT_playback(Menu): - bl_label = _("Playback") + bl_label = "Playback" def draw(self, context): layout = self.layout @@ -189,7 +189,7 @@ class TIME_MT_playback(Menu): class TIME_MT_autokey(Menu): - bl_label = _("Auto-Keyframing Mode") + bl_label = "Auto-Keyframing Mode" def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index c90497de29c..d1009a018f0 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -116,7 +116,7 @@ class USERPREF_PT_tabs(Panel): class USERPREF_MT_interaction_presets(Menu): - bl_label = _("Presets") + bl_label = "Presets" preset_subdir = "interaction" preset_operator = "script.execute_preset" draw = Menu.draw_preset @@ -153,7 +153,7 @@ class USERPREF_MT_splash(Menu): class USERPREF_PT_interface(Panel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("Interface") + bl_label = "Interface" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -250,7 +250,7 @@ class USERPREF_PT_interface(Panel): class USERPREF_PT_edit(Panel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("Edit") + bl_label = "Edit" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -363,7 +363,7 @@ class USERPREF_PT_edit(Panel): class USERPREF_PT_system(Panel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("System") + bl_label = "System" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -418,20 +418,6 @@ class USERPREF_PT_system(Panel): col.separator() col.separator() - #column = split.column() - #colsplit = column.split(percentage=0.85) - - # No translation in 2.5 yet - #col.prop(system, "language") - #col.label(text="Translate:") - #col.prop(system, "use_translate_tooltips", text="Tooltips") - #col.prop(system, "use_translate_buttons", text="Labels") - #col.prop(system, "use_translate_toolbox", text="Toolbox") - - #col.separator() - - #col.prop(system, "use_textured_fonts") - # 2. Column column = split.column() colsplit = column.split(percentage=0.85) @@ -486,9 +472,6 @@ class USERPREF_PT_system(Panel): column.label(text=_("Color Picker Type:")) column.row().prop(system, "color_picker_type", text="") - column.label(text=_("Select Language:")) - column.row().prop(system, "language", text="") - column.separator() column.prop(system, "use_weight_color_range", text=_("Custom Weight Paint Range")) @@ -496,10 +479,21 @@ class USERPREF_PT_system(Panel): sub.active = system.use_weight_color_range sub.template_color_ramp(system, "weight_color_range", expand=True) + column.separator() + + column.prop(system, "use_international_fonts") + if system.use_international_fonts: + column.label(text=_("Select Language:")) + column.prop(system, "language", text="") + column.label(text="Translate:") + row = column.row() + row.prop(system, "use_translate_interface", text="Interface") + row.prop(system, "use_translate_tooltips", text="Tooltips") + class USERPREF_PT_theme(Panel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("Themes") + bl_label = "Themes" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -682,7 +676,7 @@ class USERPREF_PT_theme(Panel): class USERPREF_PT_file(Panel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("Files") + bl_label = "Files" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -758,7 +752,7 @@ from bl_ui.space_userpref_keymap import InputKeyMapPanel class USERPREF_MT_ndof_settings(Menu): # accessed from the window keybindings in C (only) - bl_label = _("3D Mouse Settings") + bl_label = "3D Mouse Settings" def draw(self, context): layout = self.layout @@ -794,7 +788,7 @@ class USERPREF_MT_ndof_settings(Menu): class USERPREF_PT_input(Panel, InputKeyMapPanel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("Input") + bl_label = "Input" @classmethod def poll(cls, context): @@ -883,7 +877,7 @@ class USERPREF_PT_input(Panel, InputKeyMapPanel): class USERPREF_MT_addons_dev_guides(Menu): - bl_label = _("Development Guides") + bl_label = "Development Guides" # menu to open webpages with addons development guides def draw(self, context): @@ -895,7 +889,7 @@ class USERPREF_MT_addons_dev_guides(Menu): class USERPREF_PT_addons(Panel): bl_space_type = 'USER_PREFERENCES' - bl_label = _("Addons") + bl_label = "Addons" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -1086,11 +1080,11 @@ class USERPREF_PT_addons(Panel): class WM_OT_addon_enable(Operator): "Enable an addon" bl_idname = "wm.addon_enable" - bl_label = _("Enable Add-On") + bl_label = "Enable Add-On" module = StringProperty( - name=_("Module"), - description=_("Module name of the addon to enable"), + name="Module", + description="Module name of the addon to enable", ) def execute(self, context): @@ -1115,11 +1109,11 @@ class WM_OT_addon_enable(Operator): class WM_OT_addon_disable(Operator): "Disable an addon" bl_idname = "wm.addon_disable" - bl_label = _("Disable Add-On") + bl_label = "Disable Add-On" module = StringProperty( - name=_("Module"), - description=_("Module name of the addon to disable"), + name="Module", + description="Module name of the addon to disable", ) def execute(self, context): @@ -1130,11 +1124,11 @@ class WM_OT_addon_disable(Operator): class WM_OT_addon_install(Operator): "Install an addon" bl_idname = "wm.addon_install" - bl_label = _("Install Add-On...") + bl_label = "Install Add-On..." overwrite = BoolProperty( - name=_("Overwrite"), - description=_("Remove existing addons with the same ID"), + name="Overwrite", + description="Remove existing addons with the same ID", default=True, ) target = EnumProperty( @@ -1144,16 +1138,16 @@ class WM_OT_addon_install(Operator): ) filepath = StringProperty( - name=_("File Path"), - description=_("File path to write file to"), + name="File Path", + description="File path to write file to", ) filter_folder = BoolProperty( - name=_("Filter folders"), + name="Filter folders", default=True, options={'HIDDEN'}, ) filter_python = BoolProperty( - name=_("Filter python"), + name="Filter python", default=True, options={'HIDDEN'}, ) @@ -1295,11 +1289,11 @@ class WM_OT_addon_install(Operator): class WM_OT_addon_remove(Operator): "Disable an addon" bl_idname = "wm.addon_remove" - bl_label = _("Remove Add-On") + bl_label = "Remove Add-On" module = StringProperty( - name=_("Module"), - description=_("Module name of the addon to remove"), + name="Module", + description="Module name of the addon to remove", ) @staticmethod @@ -1349,8 +1343,8 @@ class WM_OT_addon_expand(Operator): bl_label = "" module = StringProperty( - name=_("Module"), - description=_("Module name of the addon to expand"), + name="Module", + description="Module name of the addon to expand", ) def execute(self, context): diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py index 336e4edf006..bc760a73c9a 100644 --- a/release/scripts/startup/bl_ui/space_userpref_keymap.py +++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py @@ -128,7 +128,7 @@ def _merge_keymaps(kc1, kc2): class USERPREF_MT_keyconfigs(Menu): - bl_label = _("KeyPresets") + bl_label = "KeyPresets" preset_subdir = "keyconfig" preset_operator = "wm.keyconfig_activate" @@ -143,7 +143,7 @@ class USERPREF_MT_keyconfigs(Menu): class InputKeyMapPanel: bl_space_type = 'USER_PREFERENCES' - bl_label = _("Input") + bl_label = "Input" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -263,7 +263,7 @@ class InputKeyMapPanel: if km.is_modal: row.prop(kmi, "propvalue", text="") else: - row.label(text=kmi.name) + row.label(text=_(kmi.name)) row = split.row() row.prop(kmi, "map_type", text="") @@ -426,7 +426,6 @@ class WM_OT_keyconfig_test(Operator): "Test keyconfig for conflicts" bl_idname = "wm.keyconfig_test" bl_label = _("Test Key Configuration for Conflicts") - __doc__ = _("Test keyconfig for conflicts") def testEntry(self, kc, entry, src=None, parent=None): result = False @@ -534,32 +533,31 @@ def _string_value(value): class WM_OT_keyconfig_import(Operator): "Import key configuration from a python script" bl_idname = "wm.keyconfig_import" - bl_label = _("Import Key Configuration...") - __doc__ = _("Import key configuration from a python script") + bl_label = "Import Key Configuration..." filepath = StringProperty( - name=_("File Path"), - description=_("Filepath to write file to"), + name="File Path", + description="Filepath to write file to", default="keymap.py", ) filter_folder = BoolProperty( - name=_("Filter folders"), + name="Filter folders", default=True, options={'HIDDEN'}, ) filter_text = BoolProperty( - name=_("Filter text"), + name="Filter text", default=True, options={'HIDDEN'}, ) filter_python = BoolProperty( - name=_("Filter python"), + name="Filter python", default=True, options={'HIDDEN'}, ) keep_original = BoolProperty( - name=_("Keep original"), - description=_("Keep original file after copying to configuration folder"), + name="Keep original", + description="Keep original file after copying to configuration folder", default=True, ) @@ -602,25 +600,24 @@ class WM_OT_keyconfig_export(Operator): "Export key configuration to a python script" bl_idname = "wm.keyconfig_export" bl_label = _("Export Key Configuration...") - __doc__ = _("Export key configuration to a python script") filepath = StringProperty( - name=_("File Path"), - description=_("Filepath to write file to"), + name="File Path", + description="Filepath to write file to", default="keymap.py", ) filter_folder = BoolProperty( - name=_("Filter folders"), + name="Filter folders", default=True, options={'HIDDEN'}, ) filter_text = BoolProperty( - name=_("Filter text"), + name="Filter text", default=True, options={'HIDDEN'}, ) filter_python = BoolProperty( - name=_("Filter python"), + name="Filter python", default=True, options={'HIDDEN'}, ) @@ -711,12 +708,11 @@ class WM_OT_keyconfig_export(Operator): class WM_OT_keymap_restore(Operator): "Restore key map(s)" bl_idname = "wm.keymap_restore" - bl_label = _("Restore Key Map(s)") - __doc__ = _("Restore key map(s)") + bl_label = "Restore Key Map(s)" all = BoolProperty( - name=_("All Keymaps"), - description=_("Restore all keymaps to default"), + name="All Keymaps", + description="Restore all keymaps to default", ) def execute(self, context): @@ -735,12 +731,11 @@ class WM_OT_keymap_restore(Operator): class WM_OT_keyitem_restore(Operator): "Restore key map item" bl_idname = "wm.keyitem_restore" - bl_label = _("Restore Key Map Item") - __doc__ = _("Restore key map item") + bl_label = "Restore Key Map Item" item_id = IntProperty( - name=_("Item Identifier"), - description=_("Identifier of the item to remove"), + name="Item Identifier", + description="Identifier of the item to remove", ) @classmethod @@ -761,8 +756,7 @@ class WM_OT_keyitem_restore(Operator): class WM_OT_keyitem_add(Operator): "Add key map item" bl_idname = "wm.keyitem_add" - bl_label = _("Add Key Map Item") - __doc__ = _("Add key map item") + bl_label = "Add Key Map Item" def execute(self, context): km = context.keymap @@ -784,12 +778,11 @@ class WM_OT_keyitem_add(Operator): class WM_OT_keyitem_remove(Operator): "Remove key map item" bl_idname = "wm.keyitem_remove" - bl_label = _("Remove Key Map Item") - __doc__ = _("Remove key map item") + bl_label = "Remove Key Map Item" item_id = IntProperty( - name=_("Item Identifier"), - description=_("Identifier of the item to remove"), + name="Item Identifier", + description="Identifier of the item to remove", ) @classmethod @@ -806,8 +799,7 @@ class WM_OT_keyitem_remove(Operator): class WM_OT_keyconfig_remove(Operator): "Remove key config" bl_idname = "wm.keyconfig_remove" - bl_label = _("Remove Key Config") - __doc__ = _("Remove key config") + bl_label = "Remove Key Config" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c78ad774165..69dd18d7a60 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -119,7 +119,7 @@ class VIEW3D_HT_header(Header): class ShowHideMenu(): - bl_label = _("Show/Hide") + bl_label = "Show/Hide" _operator_name = "" def draw(self, context): @@ -131,17 +131,17 @@ class ShowHideMenu(): class VIEW3D_MT_transform(Menu): - bl_label = _("Transform") + bl_label = "Transform" # TODO: get rid of the custom text strings? def draw(self, context): layout = self.layout - layout.operator("transform.translate", text=_("Grab/Move")) + layout.operator("transform.translate", text="Grab/Move") # TODO: sub-menu for grab per axis - layout.operator("transform.rotate", text=_("Rotate")) + layout.operator("transform.rotate", text="Rotate") # TODO: sub-menu for rot per axis - layout.operator("transform.resize", text=_("Scale")) + layout.operator("transform.resize", text="Scale") # TODO: sub-menu for scale per axis layout.separator() @@ -187,7 +187,7 @@ class VIEW3D_MT_transform(Menu): class VIEW3D_MT_mirror(Menu): - bl_label = _("Mirror") + bl_label = "Mirror" def draw(self, context): layout = self.layout @@ -225,7 +225,7 @@ class VIEW3D_MT_mirror(Menu): class VIEW3D_MT_snap(Menu): - bl_label = _("Snap") + bl_label = "Snap" def draw(self, context): layout = self.layout @@ -242,7 +242,7 @@ class VIEW3D_MT_snap(Menu): class VIEW3D_MT_uv_map(Menu): - bl_label = _("UV Mapping") + bl_label = "UV Mapping" def draw(self, context): layout = self.layout @@ -275,7 +275,7 @@ class VIEW3D_MT_uv_map(Menu): class VIEW3D_MT_view(Menu): - bl_label = _("View") + bl_label = "View" def draw(self, context): layout = self.layout @@ -333,7 +333,7 @@ class VIEW3D_MT_view(Menu): class VIEW3D_MT_view_navigation(Menu): - bl_label = _("Navigation") + bl_label = "Navigation" def draw(self, context): layout = self.layout @@ -356,7 +356,7 @@ class VIEW3D_MT_view_navigation(Menu): class VIEW3D_MT_view_align(Menu): - bl_label = _("Align View") + bl_label = "Align View" def draw(self, context): layout = self.layout @@ -372,7 +372,7 @@ class VIEW3D_MT_view_align(Menu): class VIEW3D_MT_view_align_selected(Menu): - bl_label = _("Align View to Selected") + bl_label = "Align View to Selected" def draw(self, context): layout = self.layout @@ -398,7 +398,7 @@ class VIEW3D_MT_view_align_selected(Menu): class VIEW3D_MT_view_cameras(Menu): - bl_label = _("Cameras") + bl_label = "Cameras" def draw(self, context): layout = self.layout @@ -410,7 +410,7 @@ class VIEW3D_MT_view_cameras(Menu): class VIEW3D_MT_select_object(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -436,7 +436,7 @@ class VIEW3D_MT_select_object(Menu): class VIEW3D_MT_select_pose(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -473,7 +473,7 @@ class VIEW3D_MT_select_pose(Menu): class VIEW3D_MT_select_particle(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -498,7 +498,7 @@ class VIEW3D_MT_select_particle(Menu): class VIEW3D_MT_select_edit_mesh(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -550,7 +550,7 @@ class VIEW3D_MT_select_edit_mesh(Menu): class VIEW3D_MT_select_edit_curve(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -579,7 +579,7 @@ class VIEW3D_MT_select_edit_curve(Menu): class VIEW3D_MT_select_edit_surface(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -605,7 +605,7 @@ class VIEW3D_MT_select_edit_surface(Menu): class VIEW3D_MT_select_edit_metaball(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -623,7 +623,7 @@ class VIEW3D_MT_select_edit_metaball(Menu): class VIEW3D_MT_select_edit_lattice(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -636,7 +636,7 @@ class VIEW3D_MT_select_edit_lattice(Menu): class VIEW3D_MT_select_edit_armature(Menu): - bl_label = _("Select") + bl_label = "Select" def draw(self, context): layout = self.layout @@ -667,7 +667,7 @@ class VIEW3D_MT_select_edit_armature(Menu): class VIEW3D_MT_select_face(Menu): # XXX no matching enum - bl_label = _("Select") + bl_label = "Select" def draw(self, context): # layout = self.layout @@ -681,7 +681,7 @@ class VIEW3D_MT_select_face(Menu): # XXX no matching enum class VIEW3D_MT_object(Menu): bl_context = "objectmode" - bl_label = _("Object") + bl_label = "Object" def draw(self, context): layout = self.layout @@ -738,7 +738,7 @@ class VIEW3D_MT_object(Menu): class VIEW3D_MT_object_animation(Menu): - bl_label = _("Animation") + bl_label = "Animation" def draw(self, context): layout = self.layout @@ -749,7 +749,7 @@ class VIEW3D_MT_object_animation(Menu): class VIEW3D_MT_object_clear(Menu): - bl_label = _("Clear") + bl_label = "Clear" def draw(self, context): layout = self.layout @@ -761,7 +761,7 @@ class VIEW3D_MT_object_clear(Menu): class VIEW3D_MT_object_specials(Menu): - bl_label = _("Specials") + bl_label = "Specials" @classmethod def poll(cls, context): @@ -856,7 +856,7 @@ class VIEW3D_MT_object_specials(Menu): class VIEW3D_MT_object_apply(Menu): - bl_label = _("Apply") + bl_label = "Apply" def draw(self, context): layout = self.layout @@ -875,7 +875,7 @@ class VIEW3D_MT_object_apply(Menu): class VIEW3D_MT_object_parent(Menu): - bl_label = _("Parent") + bl_label = "Parent" def draw(self, context): layout = self.layout @@ -885,7 +885,7 @@ class VIEW3D_MT_object_parent(Menu): class VIEW3D_MT_object_track(Menu): - bl_label = _("Track") + bl_label = "Track" def draw(self, context): layout = self.layout @@ -895,7 +895,7 @@ class VIEW3D_MT_object_track(Menu): class VIEW3D_MT_object_group(Menu): - bl_label = _("Group") + bl_label = "Group" def draw(self, context): layout = self.layout @@ -910,7 +910,7 @@ class VIEW3D_MT_object_group(Menu): class VIEW3D_MT_object_constraints(Menu): - bl_label = _("Constraints") + bl_label = "Constraints" def draw(self, context): layout = self.layout @@ -921,7 +921,7 @@ class VIEW3D_MT_object_constraints(Menu): class VIEW3D_MT_object_showhide(Menu): - bl_label = _("Show/Hide") + bl_label = "Show/Hide" def draw(self, context): layout = self.layout @@ -932,7 +932,7 @@ class VIEW3D_MT_object_showhide(Menu): class VIEW3D_MT_make_single_user(Menu): - bl_label = _("Make Single User") + bl_label = "Make Single User" def draw(self, context): layout = self.layout @@ -954,7 +954,7 @@ class VIEW3D_MT_make_single_user(Menu): class VIEW3D_MT_make_links(Menu): - bl_label = _("Make Links") + bl_label = "Make Links" def draw(self, context): layout = self.layout @@ -971,7 +971,7 @@ class VIEW3D_MT_make_links(Menu): class VIEW3D_MT_object_game(Menu): - bl_label = _("Game") + bl_label = "Game" def draw(self, context): layout = self.layout @@ -993,7 +993,7 @@ class VIEW3D_MT_object_game(Menu): class VIEW3D_MT_paint_vertex(Menu): - bl_label = _("Paint") + bl_label = "Paint" def draw(self, context): layout = self.layout @@ -1008,7 +1008,7 @@ class VIEW3D_MT_paint_vertex(Menu): class VIEW3D_MT_hook(Menu): - bl_label = _("Hooks") + bl_label = "Hooks" def draw(self, context): layout = self.layout @@ -1027,7 +1027,7 @@ class VIEW3D_MT_hook(Menu): class VIEW3D_MT_vertex_group(Menu): - bl_label = _("Vertex Groups") + bl_label = "Vertex Groups" def draw(self, context): layout = self.layout @@ -1052,7 +1052,7 @@ class VIEW3D_MT_vertex_group(Menu): class VIEW3D_MT_paint_weight(Menu): - bl_label = _("Weights") + bl_label = "Weights" def draw(self, context): layout = self.layout @@ -1082,7 +1082,7 @@ class VIEW3D_MT_paint_weight(Menu): class VIEW3D_MT_sculpt(Menu): - bl_label = _("Sculpt") + bl_label = "Sculpt" def draw(self, context): layout = self.layout @@ -1132,7 +1132,7 @@ class VIEW3D_MT_sculpt(Menu): class VIEW3D_MT_particle(Menu): - bl_label = _("Particle") + bl_label = "Particle" def draw(self, context): layout = self.layout @@ -1164,7 +1164,7 @@ class VIEW3D_MT_particle(Menu): class VIEW3D_MT_particle_specials(Menu): - bl_label = _("Specials") + bl_label = "Specials" def draw(self, context): layout = self.layout @@ -1188,7 +1188,7 @@ class VIEW3D_MT_particle_showhide(ShowHideMenu, Menu): class VIEW3D_MT_pose(Menu): - bl_label = _("Pose") + bl_label = "Pose" def draw(self, context): layout = self.layout @@ -1257,7 +1257,7 @@ class VIEW3D_MT_pose(Menu): class VIEW3D_MT_pose_transform(Menu): - bl_label = _("Clear Transform") + bl_label = "Clear Transform" def draw(self, context): layout = self.layout @@ -1276,7 +1276,7 @@ class VIEW3D_MT_pose_transform(Menu): class VIEW3D_MT_pose_slide(Menu): - bl_label = _("In-Betweens") + bl_label = "In-Betweens" def draw(self, context): layout = self.layout @@ -1287,7 +1287,7 @@ class VIEW3D_MT_pose_slide(Menu): class VIEW3D_MT_pose_propagate(Menu): - bl_label = _("Propagate") + bl_label = "Propagate" def draw(self, context): layout = self.layout @@ -1305,7 +1305,7 @@ class VIEW3D_MT_pose_propagate(Menu): class VIEW3D_MT_pose_library(Menu): - bl_label = _("Pose Library") + bl_label = "Pose Library" def draw(self, context): layout = self.layout @@ -1320,7 +1320,7 @@ class VIEW3D_MT_pose_library(Menu): class VIEW3D_MT_pose_motion(Menu): - bl_label = _("Motion Paths") + bl_label = "Motion Paths" def draw(self, context): layout = self.layout @@ -1330,7 +1330,7 @@ class VIEW3D_MT_pose_motion(Menu): class VIEW3D_MT_pose_group(Menu): - bl_label = _("Bone Groups") + bl_label = "Bone Groups" def draw(self, context): layout = self.layout @@ -1344,7 +1344,7 @@ class VIEW3D_MT_pose_group(Menu): class VIEW3D_MT_pose_ik(Menu): - bl_label = _("Inverse Kinematics") + bl_label = "Inverse Kinematics" def draw(self, context): layout = self.layout @@ -1354,7 +1354,7 @@ class VIEW3D_MT_pose_ik(Menu): class VIEW3D_MT_pose_constraints(Menu): - bl_label = _("Constraints") + bl_label = "Constraints" def draw(self, context): layout = self.layout @@ -1425,7 +1425,7 @@ class VIEW3D_MT_bone_options_disable(Menu, BoneOptions): class VIEW3D_MT_edit_mesh(Menu): - bl_label = _("Mesh") + bl_label = "Mesh" def draw(self, context): layout = self.layout @@ -1472,7 +1472,7 @@ class VIEW3D_MT_edit_mesh(Menu): class VIEW3D_MT_edit_mesh_specials(Menu): - bl_label = _("Specials") + bl_label = "Specials" def draw(self, context): layout = self.layout @@ -1497,7 +1497,7 @@ class VIEW3D_MT_edit_mesh_specials(Menu): class VIEW3D_MT_edit_mesh_select_mode(Menu): - bl_label = _("Mesh Select Mode") + bl_label = "Mesh Select Mode" def draw(self, context): layout = self.layout @@ -1518,7 +1518,7 @@ class VIEW3D_MT_edit_mesh_select_mode(Menu): class VIEW3D_MT_edit_mesh_extrude(Menu): - bl_label = _("Extrude") + bl_label = "Extrude" _extrude_funcs = { \ "VERT": lambda layout: layout.operator("mesh.extrude_vertices_move", text=_("Vertices Only")), @@ -1553,7 +1553,7 @@ class VIEW3D_MT_edit_mesh_extrude(Menu): class VIEW3D_OT_edit_mesh_extrude_individual_move(Operator): "Extrude individual elements and move" - bl_label = _("Extrude Individual and Move") + bl_label = "Extrude Individual and Move" bl_idname = "view3d.edit_mesh_extrude_individual_move" def execute(self, context): @@ -1582,7 +1582,7 @@ class VIEW3D_OT_edit_mesh_extrude_individual_move(Operator): class VIEW3D_OT_edit_mesh_extrude_move(Operator): "Extrude and move along normals" - bl_label = _("Extrude and Move on Normals") + bl_label = "Extrude and Move on Normals" bl_idname = "view3d.edit_mesh_extrude_move_normal" def execute(self, context): @@ -1607,7 +1607,7 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator): class VIEW3D_MT_edit_mesh_vertices(Menu): - bl_label = _("Vertices") + bl_label = "Vertices" def draw(self, context): layout = self.layout @@ -1639,7 +1639,7 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): class VIEW3D_MT_edit_mesh_edges(Menu): - bl_label = _("Edges") + bl_label = "Edges" def draw(self, context): layout = self.layout @@ -1679,7 +1679,7 @@ class VIEW3D_MT_edit_mesh_edges(Menu): class VIEW3D_MT_edit_mesh_faces(Menu): - bl_label = _("Faces") + bl_label = "Faces" bl_idname = "VIEW3D_MT_edit_mesh_faces" def draw(self, context): @@ -1727,7 +1727,7 @@ class VIEW3D_MT_edit_mesh_faces(Menu): class VIEW3D_MT_edit_mesh_normals(Menu): - bl_label = _("Normals") + bl_label = "Normals" def draw(self, context): layout = self.layout @@ -1781,13 +1781,13 @@ def draw_curve(self, context): class VIEW3D_MT_edit_curve(Menu): - bl_label = _("Curve") + bl_label = "Curve" draw = draw_curve class VIEW3D_MT_edit_curve_ctrlpoints(Menu): - bl_label = _("Control Points") + bl_label = "Control Points" def draw(self, context): layout = self.layout @@ -1809,7 +1809,7 @@ class VIEW3D_MT_edit_curve_ctrlpoints(Menu): class VIEW3D_MT_edit_curve_segments(Menu): - bl_label = _("Segments") + bl_label = "Segments" def draw(self, context): layout = self.layout @@ -1819,7 +1819,7 @@ class VIEW3D_MT_edit_curve_segments(Menu): class VIEW3D_MT_edit_curve_specials(Menu): - bl_label = _("Specials") + bl_label = "Specials" def draw(self, context): layout = self.layout @@ -1837,13 +1837,13 @@ class VIEW3D_MT_edit_curve_showhide(ShowHideMenu, Menu): class VIEW3D_MT_edit_surface(Menu): - bl_label = _("Surface") + bl_label = "Surface" draw = draw_curve class VIEW3D_MT_edit_font(Menu): - bl_label = _("Text") + bl_label = "Text" def draw(self, context): layout = self.layout @@ -1863,7 +1863,7 @@ class VIEW3D_MT_edit_font(Menu): class VIEW3D_MT_edit_text_chars(Menu): - bl_label = _("Special Characters") + bl_label = "Special Characters" def draw(self, context): layout = self.layout @@ -1897,7 +1897,7 @@ class VIEW3D_MT_edit_text_chars(Menu): class VIEW3D_MT_edit_meta(Menu): - bl_label = _("Metaball") + bl_label = "Metaball" def draw(self, context): layout = self.layout @@ -1930,7 +1930,7 @@ class VIEW3D_MT_edit_meta(Menu): class VIEW3D_MT_edit_meta_showhide(Menu): - bl_label = _("Show/Hide") + bl_label = "Show/Hide" def draw(self, context): layout = self.layout @@ -1941,7 +1941,7 @@ class VIEW3D_MT_edit_meta_showhide(Menu): class VIEW3D_MT_edit_lattice(Menu): - bl_label = _("Lattice") + bl_label = "Lattice" def draw(self, context): layout = self.layout @@ -1963,7 +1963,7 @@ class VIEW3D_MT_edit_lattice(Menu): class VIEW3D_MT_edit_armature(Menu): - bl_label = _("Armature") + bl_label = "Armature" def draw(self, context): layout = self.layout @@ -2018,7 +2018,7 @@ class VIEW3D_MT_edit_armature(Menu): class VIEW3D_MT_armature_specials(Menu): - bl_label = _("Specials") + bl_label = "Specials" def draw(self, context): layout = self.layout @@ -2038,7 +2038,7 @@ class VIEW3D_MT_armature_specials(Menu): class VIEW3D_MT_edit_armature_parent(Menu): - bl_label = _("Parent") + bl_label = "Parent" def draw(self, context): layout = self.layout @@ -2048,7 +2048,7 @@ class VIEW3D_MT_edit_armature_parent(Menu): class VIEW3D_MT_edit_armature_roll(Menu): - bl_label = _("Bone Roll") + bl_label = "Bone Roll" def draw(self, context): layout = self.layout @@ -2065,7 +2065,7 @@ class VIEW3D_MT_edit_armature_roll(Menu): class VIEW3D_PT_view3d_properties(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("View") + bl_label = "View" @classmethod def poll(cls, context): @@ -2108,7 +2108,7 @@ class VIEW3D_PT_view3d_properties(Panel): class VIEW3D_PT_view3d_name(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Item") + bl_label = "Item" @classmethod def poll(cls, context): @@ -2133,7 +2133,7 @@ class VIEW3D_PT_view3d_name(Panel): class VIEW3D_PT_view3d_display(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Display") + bl_label = "Display" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -2205,7 +2205,7 @@ class VIEW3D_PT_view3d_display(Panel): class VIEW3D_PT_view3d_meshdisplay(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Mesh Display") + bl_label = "Mesh Display" @classmethod def poll(cls, context): @@ -2242,7 +2242,7 @@ class VIEW3D_PT_view3d_meshdisplay(Panel): class VIEW3D_PT_view3d_curvedisplay(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Curve Display") + bl_label = "Curve Display" @classmethod def poll(cls, context): @@ -2264,7 +2264,7 @@ class VIEW3D_PT_view3d_curvedisplay(Panel): class VIEW3D_PT_background_image(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Background Images") + bl_label = "Background Images" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -2317,7 +2317,7 @@ class VIEW3D_PT_background_image(Panel): class VIEW3D_PT_transform_orientations(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Transform Orientations") + bl_label = "Transform Orientations" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -2345,7 +2345,7 @@ class VIEW3D_PT_transform_orientations(Panel): class VIEW3D_PT_etch_a_ton(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Skeleton Sketching") + bl_label = "Skeleton Sketching" bl_options = {'DEFAULT_CLOSED'} @classmethod @@ -2390,7 +2390,7 @@ class VIEW3D_PT_etch_a_ton(Panel): class VIEW3D_PT_context_properties(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' - bl_label = _("Properties") + bl_label = "Properties" bl_options = {'DEFAULT_CLOSED'} def _active_context_member(context): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 16d4b9b7fe6..7ac2df7b5d5 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -68,7 +68,7 @@ def draw_gpencil_tools(context, layout): class VIEW3D_PT_tools_objectmode(View3DPanel, Panel): bl_context = "objectmode" - bl_label = _("Object Tools") + bl_label = "Object Tools" def draw(self, context): layout = self.layout diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 9ec9dd1caa0..7b78bd05fff 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -307,7 +307,7 @@ void BLF_enable(int fontid, int option) const char* BLF_gettext(const char *msgid) { #ifdef INTERNATIONAL - if( msgid!=NULL && strlen(msgid)>0 ) + if( msgid[0] ) return gettext( msgid ); return ""; #else diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index cfa7514f9af..89d2d365013 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -39,6 +39,11 @@ #ifdef INTERNATIONAL #include + +#if defined (_WIN32) +#include +#endif + #include "libintl.h" #include "DNA_userdef_types.h" @@ -52,11 +57,6 @@ #include "BLI_string.h" #include "BLI_path_util.h" - -#ifdef __APPLE__ - -#endif - #define DOMAIN_NAME "blender" #define SYSTEM_ENCODING_DEFAULT "UTF-8" #define FONT_SIZE_DEFAULT 12 @@ -113,59 +113,81 @@ void BLF_lang_set(const char *str) { char *locreturn; const char *short_locale; + int ok= 1; #if defined (_WIN32) char *long_locale = locales[ 2 * U.language]; #endif + if((U.transopts&USER_DOTRANSLATE)==0) + return; + if(str) short_locale = str; else short_locale = locales[ 2 * U.language + 1]; #if defined (_WIN32) - if(short_locale) - { + if(short_locale) { char *envStr; + if( U.language==0 )/* use system setting */ envStr = BLI_sprintfN( "LANG=%s", getenv("LANG") ); else envStr = BLI_sprintfN( "LANG=%s", short_locale ); + gettext_putenv(envStr); MEM_freeN(envStr); } + locreturn= setlocale(LC_ALL, long_locale); + if (locreturn == NULL) { printf("Could not change locale to %s\n", long_locale); + ok= 0; } #else - if(short_locale) { - BLI_setenv("LANG", short_locale); - BLI_setenv("LANGUAGE", short_locale); - } + const char *locale; + static char default_locale[64]="\0"; - locreturn= setlocale(LC_ALL, short_locale); - if (locreturn == NULL) { - char *short_locale_utf8 = BLI_sprintfN("%s.UTF-8", short_locale); + if(default_locale[0]==0) /* store defaul locale */ + strncpy(default_locale, getenv("LANGUAGE"), sizeof(default_locale)); + + if(short_locale[0]) + locale= short_locale; + else + locale= default_locale; + + BLI_setenv("LANG", locale); + BLI_setenv("LANGUAGE", locale); + + locreturn= setlocale(LC_ALL, locale); - locreturn= setlocale(LC_ALL, short_locale_utf8); if (locreturn == NULL) { - printf("Could not change locale to %s nor %s\n", short_locale, short_locale_utf8); - } + char *short_locale_utf8= BLI_sprintfN("%s", short_locale); - MEM_freeN(short_locale_utf8); + locreturn= setlocale(LC_ALL, short_locale_utf8); + + if (locreturn == NULL) { + printf("Could not change locale to %s nor %s\n", short_locale, short_locale_utf8); + ok= 0; + } + + MEM_freeN(short_locale_utf8); + } } #endif - else - { - printf("Change locale to %s\n", locreturn ); + + if(ok) { + //printf("Change locale to %s\n", locreturn ); BLI_strncpy(global_language, locreturn, sizeof(global_language)); } + setlocale(LC_NUMERIC, "C"); textdomain(DOMAIN_NAME); bindtextdomain(DOMAIN_NAME, global_messagepath); - /* bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); */ + bind_textdomain_codeset(DOMAIN_NAME, global_encoding_name); } void BLF_lang_encoding(const char *str) diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c old mode 100755 new mode 100644 diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index 6195289f2a6..83fe91d6f76 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript index 61cf0890bc7..96b05b8bccc 100644 --- a/source/blender/editors/animation/SConscript +++ b/source/blender/editors/animation/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] ) diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index f2311dc5536..d58d51c8e08 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -38,8 +38,6 @@ #include "BLI_utildefines.h" #include "BKE_library.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -611,10 +609,10 @@ enum { /* defines for rearranging channels */ static EnumPropertyItem prop_animchannel_rearrange_types[] = { - {REARRANGE_ANIMCHAN_TOP, "TOP", 0, N_("To Top"), ""}, - {REARRANGE_ANIMCHAN_UP, "UP", 0, N_("Up"), ""}, - {REARRANGE_ANIMCHAN_DOWN, "DOWN", 0, N_("Down"), ""}, - {REARRANGE_ANIMCHAN_BOTTOM, "BOTTOM", 0, N_("To Bottom"), ""}, + {REARRANGE_ANIMCHAN_TOP, "TOP", 0, "To Top", ""}, + {REARRANGE_ANIMCHAN_UP, "UP", 0, "Up", ""}, + {REARRANGE_ANIMCHAN_DOWN, "DOWN", 0, "Down", ""}, + {REARRANGE_ANIMCHAN_BOTTOM, "BOTTOM", 0, "To Bottom", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1107,9 +1105,9 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_move (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Channels"); + ot->name= "Move Channels"; ot->idname= "ANIM_OT_channels_move"; - ot->description = _("Rearrange selected animation channels"); + ot->description = "Rearrange selected animation channels"; /* api callbacks */ ot->exec= animchannels_rearrange_exec; @@ -1119,7 +1117,7 @@ static void ANIM_OT_channels_move (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(prop_animchannel_rearrange_types), REARRANGE_ANIMCHAN_DOWN, _("Direction"), ""); + ot->prop= RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, "Direction", ""); } /* ******************** Delete Channel Operator *********************** */ @@ -1223,9 +1221,9 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Channels"); + ot->name= "Delete Channels"; ot->idname= "ANIM_OT_channels_delete"; - ot->description= _("Delete all selected animation channels"); + ot->description= "Delete all selected animation channels"; /* api callbacks */ ot->exec= animchannels_delete_exec; @@ -1315,9 +1313,9 @@ static int animchannels_visibility_set_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_visibility_set (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Visibility"); + ot->name= "Set Visibility"; ot->idname= "ANIM_OT_channels_visibility_set"; - ot->description= _("Make only the selected animation channels visible in the Graph Editor"); + ot->description= "Make only the selected animation channels visible in the Graph Editor"; /* api callbacks */ ot->exec= animchannels_visibility_set_exec; @@ -1392,9 +1390,9 @@ static int animchannels_visibility_toggle_exec(bContext *C, wmOperator *UNUSED(o static void ANIM_OT_channels_visibility_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Visibility"); + ot->name= "Toggle Visibility"; ot->idname= "ANIM_OT_channels_visibility_toggle"; - ot->description= _("Toggle visibility in Graph Editor of all selected animation channels"); + ot->description= "Toggle visibility in Graph Editor of all selected animation channels"; /* api callbacks */ ot->exec= animchannels_visibility_toggle_exec; @@ -1408,18 +1406,18 @@ static void ANIM_OT_channels_visibility_toggle (wmOperatorType *ot) /* defines for setting animation-channel flags */ static EnumPropertyItem prop_animchannel_setflag_types[] = { - {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, N_("Toggle"), ""}, - {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, N_("Disable"), ""}, - {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, N_("Enable"), ""}, - {ACHANNEL_SETFLAG_INVERT, "INVERT", 0, N_("Invert"), ""}, + {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""}, + {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""}, + {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""}, + {ACHANNEL_SETFLAG_INVERT, "INVERT", 0, "Invert", ""}, {0, NULL, 0, NULL, NULL} }; /* defines for set animation-channel settings */ // TODO: could add some more types, but those are really quite dependent on the mode... static EnumPropertyItem prop_animchannel_settings_types[] = { - {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, N_("Protect"), ""}, - {ACHANNEL_SETTING_MUTE, "MUTE", 0, N_("Mute"), ""}, + {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""}, + {ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1535,9 +1533,9 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_setting_enable (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Enable Channel Setting"); + ot->name= "Enable Channel Setting"; ot->idname= "ANIM_OT_channels_setting_enable"; - ot->description= _("Enable specified setting on all selected animation channels"); + ot->description= "Enable specified setting on all selected animation channels"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1549,17 +1547,17 @@ static void ANIM_OT_channels_setting_enable (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_animchannel_setflag_types), ACHANNEL_SETFLAG_ADD, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_ADD, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_animchannel_settings_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } static void ANIM_OT_channels_setting_disable (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Disable Channel Setting"); + ot->name= "Disable Channel Setting"; ot->idname= "ANIM_OT_channels_setting_disable"; - ot->description= _("Disable specified setting on all selected animation channels"); + ot->description= "Disable specified setting on all selected animation channels"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1571,17 +1569,17 @@ static void ANIM_OT_channels_setting_disable (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_CLEAR, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_CLEAR, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } static void ANIM_OT_channels_setting_invert (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Invert Channel Setting"); + ot->name= "Invert Channel Setting"; ot->idname= "ANIM_OT_channels_setting_toggle"; - ot->description= _("Invert specified setting on all selected animation channels"); + ot->description= "Invert specified setting on all selected animation channels"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1593,17 +1591,17 @@ static void ANIM_OT_channels_setting_invert (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_INVERT, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_INVERT, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } static void ANIM_OT_channels_setting_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Channel Setting"); + ot->name= "Toggle Channel Setting"; ot->idname= "ANIM_OT_channels_setting_toggle"; - ot->description= _("Toggle specified setting on all selected animation channels"); + ot->description= "Toggle specified setting on all selected animation channels"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1615,17 +1613,17 @@ static void ANIM_OT_channels_setting_toggle (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, "Mode", ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); } static void ANIM_OT_channels_editable_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Channel Editability"); + ot->name= "Toggle Channel Editability"; ot->idname= "ANIM_OT_channels_editable_toggle"; - ot->description= _("Toggle editability of selected channels"); + ot->description= "Toggle editability of selected channels"; /* api callbacks */ ot->exec= animchannels_setflag_exec; @@ -1636,9 +1634,9 @@ static void ANIM_OT_channels_editable_toggle (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, "Mode", ""); /* setting to set */ - RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, ACHANNEL_SETTING_PROTECT, _("Type"), ""); + RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, ACHANNEL_SETTING_PROTECT, "Type", ""); } /* ********************** Expand Channels Operator *********************** */ @@ -1668,9 +1666,9 @@ static int animchannels_expand_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_expand (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Expand Channels"); + ot->name= "Expand Channels"; ot->idname= "ANIM_OT_channels_expand"; - ot->description= _("Expand (i.e. open) all selected expandable animation channels"); + ot->description= "Expand (i.e. open) all selected expandable animation channels"; /* api callbacks */ ot->exec= animchannels_expand_exec; @@ -1680,7 +1678,7 @@ static void ANIM_OT_channels_expand (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Expand all channels (not just selected ones)")); + ot->prop= RNA_def_boolean(ot->srna, "all", 1, "All", "Expand all channels (not just selected ones)"); } /* ********************** Collapse Channels Operator *********************** */ @@ -1710,9 +1708,9 @@ static int animchannels_collapse_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_collapse (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Collapse Channels"); + ot->name= "Collapse Channels"; ot->idname= "ANIM_OT_channels_collapse"; - ot->description= _("Collapse (i.e. close) all selected expandable animation channels"); + ot->description= "Collapse (i.e. close) all selected expandable animation channels"; /* api callbacks */ ot->exec= animchannels_collapse_exec; @@ -1722,7 +1720,7 @@ static void ANIM_OT_channels_collapse (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Collapse all channels (not just selected ones)")); + ot->prop= RNA_def_boolean(ot->srna, "all", 1, "All", "Collapse all channels (not just selected ones)"); } /* ******************* Reenable Disabled Operator ******************* */ @@ -1786,9 +1784,9 @@ static int animchannels_enable_exec (bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_fcurves_enable (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Revive Disabled F-Curves"); + ot->name= "Revive Disabled F-Curves"; ot->idname= "ANIM_OT_channels_fcurves_enable"; - ot->description= _("Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"); + ot->description= "Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"; /* api callbacks */ ot->exec= animchannels_enable_exec; @@ -1823,9 +1821,9 @@ static int animchannels_deselectall_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select All"); + ot->name= "Select All"; ot->idname= "ANIM_OT_channels_select_all_toggle"; - ot->description= _("Toggle selection of all animation channels"); + ot->description= "Toggle selection of all animation channels"; /* api callbacks */ ot->exec= animchannels_deselectall_exec; @@ -1835,7 +1833,7 @@ static void ANIM_OT_channels_select_all_toggle (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "invert", 0, _("Invert"), ""); + ot->prop= RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Borderselect Operator *********************** */ @@ -1949,9 +1947,9 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); + ot->name= "Border Select"; ot->idname= "ANIM_OT_channels_select_border"; - ot->description= _("Select all animation channels within the specified region"); + ot->description= "Select all animation channels within the specified region"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -2369,9 +2367,9 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent * static void ANIM_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mouse Click on Channels"); + ot->name= "Mouse Click on Channels"; ot->idname= "ANIM_OT_channels_click"; - ot->description= _("Handle mouse-clicks over animation channels"); + ot->description= "Handle mouse-clicks over animation channels"; /* api callbacks */ ot->invoke= animchannels_mouseclick_invoke; @@ -2381,8 +2379,8 @@ static void ANIM_OT_channels_click (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "children_only", 0, _("Select Children Only"), ""); // CTRLKEY|SHIFTKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "children_only", 0, "Select Children Only", ""); // CTRLKEY|SHIFTKEY } /* ************************************************************************** */ diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index ab38723bbcc..5345fcd756d 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -43,8 +43,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_main.h" @@ -577,8 +575,8 @@ static int ed_marker_add(bContext *C, wmOperator *UNUSED(op)) static void MARKER_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Time Marker"); - ot->description= _("Add a new time marker"); + ot->name= "Add Time Marker"; + ot->description= "Add a new time marker"; ot->idname= "MARKER_OT_add"; /* api callbacks */ @@ -880,8 +878,8 @@ static int ed_marker_move_exec(bContext *C, wmOperator *op) static void MARKER_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Time Marker"); - ot->description= _("Move selected time marker(s)"); + ot->name= "Move Time Marker"; + ot->description= "Move selected time marker(s)"; ot->idname= "MARKER_OT_move"; /* api callbacks */ @@ -895,7 +893,7 @@ static void MARKER_OT_move(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* rna storage */ - RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, _("Frames"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX); } /* ************************** duplicate markers *************************** */ @@ -975,8 +973,8 @@ static int ed_marker_duplicate_invoke_wrapper(bContext *C, wmOperator *op, wmEve static void MARKER_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Time Marker"); - ot->description= _("Duplicate selected time marker(s)"); + ot->name= "Duplicate Time Marker"; + ot->description= "Duplicate selected time marker(s)"; ot->idname= "MARKER_OT_duplicate"; /* api callbacks */ @@ -990,7 +988,7 @@ static void MARKER_OT_duplicate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* rna storage */ - RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, _("Frames"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "frames", 0, INT_MIN, INT_MAX, "Frames", "", INT_MIN, INT_MAX); } /* ************************** selection ************************************/ @@ -1098,8 +1096,8 @@ static int ed_marker_select_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Time Marker"); - ot->description= _("Select time marker(s)"); + ot->name= "Select Time Marker"; + ot->description= "Select time marker(s)"; ot->idname= "MARKER_OT_select"; /* api callbacks */ @@ -1109,9 +1107,9 @@ static void MARKER_OT_select(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("extend the selection")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "extend the selection"); #ifdef DURIAN_CAMERA_SWITCH - RNA_def_boolean(ot->srna, "camera", 0, _("Camera"), _("Select the camera")); + RNA_def_boolean(ot->srna, "camera", 0, "Camera", "Select the camera"); #endif } @@ -1182,8 +1180,8 @@ static int ed_marker_select_border_invoke_wrapper(bContext *C, wmOperator *op, w static void MARKER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Marker Border select"); - ot->description= _("Select all time markers using border selection"); + ot->name= "Marker Border select"; + ot->description= "Select all time markers using border selection"; ot->idname= "MARKER_OT_select_border"; /* api callbacks */ @@ -1239,8 +1237,8 @@ static int ed_marker_select_all_exec(bContext *C, wmOperator *op) static void MARKER_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("(De)select all markers"); - ot->description= _("Change selection of all time markers"); + ot->name= "(De)select all markers"; + ot->description= "Change selection of all time markers"; ot->idname= "MARKER_OT_select_all"; /* api callbacks */ @@ -1292,8 +1290,8 @@ static int ed_marker_delete_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Markers"); - ot->description= _("Delete selected time marker(s)"); + ot->name= "Delete Markers"; + ot->description= "Delete selected time marker(s)"; ot->idname= "MARKER_OT_delete"; /* api callbacks */ @@ -1340,8 +1338,8 @@ static int ed_marker_rename_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_rename(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rename Marker"); - ot->description= _("Rename first selected time marker"); + ot->name= "Rename Marker"; + ot->description= "Rename first selected time marker"; ot->idname= "MARKER_OT_rename"; /* api callbacks */ @@ -1353,7 +1351,7 @@ static void MARKER_OT_rename(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), _("Name"), _("New name for marker")); + ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), "Name", "New name for marker"); //RNA_def_boolean(ot->srna, "ensure_unique", 0, "Ensure Unique", "Ensure that new name is unique within collection of markers"); } @@ -1393,8 +1391,8 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Make Links to Scene"); - ot->description= _("Copy selected markers to another scene"); + ot->name= "Make Links to Scene"; + ot->description= "Copy selected markers to another scene"; ot->idname= "MARKER_OT_make_links_scene"; /* api callbacks */ @@ -1406,7 +1404,7 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, _("Scene"), ""); + prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); ot->prop= prop; @@ -1443,8 +1441,8 @@ static int ed_marker_camera_bind_exec(bContext *C, wmOperator *UNUSED(op)) static void MARKER_OT_camera_bind(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Bind Camera to Markers"); - ot->description= _("Bind the active camera to selected markers(s)"); + ot->name= "Bind Camera to Markers"; + ot->description= "Bind the active camera to selected markers(s)"; ot->idname= "MARKER_OT_camera_bind"; /* api callbacks */ diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 3cb4cbe30c4..aa61afbac78 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -35,7 +35,6 @@ #include "BLO_sys_types.h" #include "BLI_utildefines.h" -#include "BLF_api.h" #include "DNA_anim_types.h" #include "DNA_scene_types.h" @@ -162,9 +161,9 @@ static int change_frame_modal(bContext *C, wmOperator *op, wmEvent *event) static void ANIM_OT_change_frame(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change frame"); + ot->name= "Change frame"; ot->idname= "ANIM_OT_change_frame"; - ot->description= _("Interactively change the current frame number"); + ot->description= "Interactively change the current frame number"; /* api callbacks */ ot->exec= change_frame_exec; @@ -176,7 +175,7 @@ static void ANIM_OT_change_frame(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING|OPTYPE_UNDO; /* rna */ - RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, _("Frame"), "", MINAFRAME, MAXFRAME); + RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, "Frame", "", MINAFRAME, MAXFRAME); } /* ****************** set preview range operator ****************************/ @@ -217,9 +216,9 @@ static int previewrange_define_exec(bContext *C, wmOperator *op) static void ANIM_OT_previewrange_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Preview Range"); + ot->name= "Set Preview Range"; ot->idname= "ANIM_OT_previewrange_set"; - ot->description= _("Interactively define frame range used for playback"); + ot->description= "Interactively define frame range used for playback"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -234,11 +233,11 @@ static void ANIM_OT_previewrange_set(wmOperatorType *ot) /* rna */ /* used to define frame range */ - RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, _("X Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, _("X Max"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX); /* these are not used, but are needed by borderselect gesture operator stuff */ - RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, _("Y Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, _("Y Max"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); } /* ****************** clear preview range operator ****************************/ @@ -265,9 +264,9 @@ static int previewrange_clear_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_previewrange_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Preview Range"); + ot->name= "Clear Preview Range"; ot->idname= "ANIM_OT_previewrange_clear"; - ot->description= _("Clear Preview Range"); + ot->description= "Clear Preview Range"; /* api callbacks */ ot->exec= previewrange_clear_exec; @@ -333,9 +332,9 @@ static int toggle_time_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_time_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Frames/Seconds"); + ot->name= "Toggle Frames/Seconds"; ot->idname= "ANIM_OT_time_toggle"; - ot->description= _("Toggle whether timing is displayed in frames or seconds for active timeline view"); + ot->description= "Toggle whether timing is displayed in frames or seconds for active timeline view"; /* api callbacks */ ot->exec= toggle_time_exec; diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 5943eb9500e..6ebe488d2c8 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -38,8 +38,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_material_types.h" @@ -529,7 +527,7 @@ void ANIM_OT_driver_button_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Create drivers for all elements of the array.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Create drivers for all elements of the array."); } /* Remove Driver Button Operator ------------------------ */ @@ -581,7 +579,7 @@ void ANIM_OT_driver_button_remove (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Delete drivers for all elements of the array.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Delete drivers for all elements of the array."); } /* Copy Driver Button Operator ------------------------ */ diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 8f6f7c6fac6..1e7c18dc6ac 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -43,8 +43,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" @@ -1180,9 +1178,9 @@ void ANIM_OT_keyframe_insert (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Insert Keyframe"); + ot->name= "Insert Keyframe"; ot->idname= "ANIM_OT_keyframe_insert"; - ot->description= _("Insert keyframes on the current frame for all properties in the specified Keying Set"); + ot->description= "Insert keyframes on the current frame for all properties in the specified Keying Set"; /* callbacks */ ot->exec= insert_key_exec; @@ -1192,7 +1190,7 @@ void ANIM_OT_keyframe_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); ot->prop= prop; @@ -1200,7 +1198,7 @@ void ANIM_OT_keyframe_insert (wmOperatorType *ot) /* confirm whether a keyframe was added by showing a popup * - by default, this is enabled, since this operator is assumed to be called independently */ - prop= RNA_def_boolean(ot->srna, "confirm_success", 1, _("Confirm Successful Insert"), _("Show a popup when the keyframes get successfully added")); + prop= RNA_def_boolean(ot->srna, "confirm_success", 1, "Confirm Successful Insert", "Show a popup when the keyframes get successfully added"); RNA_def_property_flag(prop, PROP_HIDDEN); } @@ -1233,9 +1231,9 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Insert Keyframe Menu"); + ot->name= "Insert Keyframe Menu"; ot->idname= "ANIM_OT_keyframe_insert_menu"; - ot->description= _("Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined"); + ot->description= "Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined"; /* callbacks */ ot->invoke= insert_key_menu_invoke; @@ -1246,7 +1244,7 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); ot->prop= prop; @@ -1255,14 +1253,14 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) * - by default, this is disabled so that if a menu is shown, this doesn't come up too */ // XXX should this just be always on? - prop= RNA_def_boolean(ot->srna, "confirm_success", 0, _("Confirm Successful Insert"), _("Show a popup when the keyframes get successfully added")); + prop= RNA_def_boolean(ot->srna, "confirm_success", 0, "Confirm Successful Insert", "Show a popup when the keyframes get successfully added"); RNA_def_property_flag(prop, PROP_HIDDEN); /* whether the menu should always be shown * - by default, the menu should only be shown when there is no active Keying Set (2.5 behaviour), * although in some cases it might be useful to always shown (pre 2.5 behaviour) */ - prop= RNA_def_boolean(ot->srna, "always_prompt", 0, _("Always Show Menu"), ""); + prop= RNA_def_boolean(ot->srna, "always_prompt", 0, "Always Show Menu", ""); RNA_def_property_flag(prop, PROP_HIDDEN); } @@ -1327,9 +1325,9 @@ void ANIM_OT_keyframe_delete (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Delete Keying-Set Keyframe"); + ot->name= "Delete Keying-Set Keyframe"; ot->idname= "ANIM_OT_keyframe_delete"; - ot->description= _("Delete keyframes on the current frame for all properties in the specified Keying Set"); + ot->description= "Delete keyframes on the current frame for all properties in the specified Keying Set"; /* callbacks */ ot->exec= delete_key_exec; @@ -1339,7 +1337,7 @@ void ANIM_OT_keyframe_delete (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); ot->prop= prop; @@ -1347,7 +1345,7 @@ void ANIM_OT_keyframe_delete (wmOperatorType *ot) /* confirm whether a keyframe was added by showing a popup * - by default, this is enabled, since this operator is assumed to be called independently */ - RNA_def_boolean(ot->srna, "confirm_success", 1, _("Confirm Successful Insert"), _("Show a popup when the keyframes get successfully added")); + RNA_def_boolean(ot->srna, "confirm_success", 1, "Confirm Successful Insert", "Show a popup when the keyframes get successfully added"); } /* Delete Key Operator ------------------------ */ @@ -1399,8 +1397,8 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_delete_v3d (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Keyframe"); - ot->description= _("Remove keyframes on current frame for selected object"); + ot->name= "Delete Keyframe"; + ot->description= "Remove keyframes on current frame for selected object"; ot->idname= "ANIM_OT_keyframe_delete_v3d"; /* callbacks */ @@ -1489,7 +1487,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_insert_button (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert Keyframe (Buttons)"); + ot->name= "Insert Keyframe (Buttons)"; ot->idname= "ANIM_OT_keyframe_insert_button"; /* callbacks */ @@ -1500,7 +1498,7 @@ void ANIM_OT_keyframe_insert_button (wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Insert a keyframe for all element of the array.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Insert a keyframe for all element of the array."); } /* Delete Key Button Operator ------------------------ */ @@ -1561,7 +1559,7 @@ static int delete_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_delete_button (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Keyframe (Buttons)"); + ot->name= "Delete Keyframe (Buttons)"; ot->idname= "ANIM_OT_keyframe_delete_button"; /* callbacks */ @@ -1572,7 +1570,7 @@ void ANIM_OT_keyframe_delete_button (wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Delete keyfames from all elements of the array.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Delete keyfames from all elements of the array."); } /* ******************************************* */ diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index e36045e84cd..dcd1c3abbde 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -43,8 +43,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" @@ -142,9 +140,9 @@ static int add_default_keyingset_exec (bContext *C, wmOperator *UNUSED(op)) void ANIM_OT_keying_set_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Empty Keying Set"); + ot->name= "Add Empty Keying Set"; ot->idname= "ANIM_OT_keying_set_add"; - ot->description= _("Add a new (empty) Keying Set to the active Scene"); + ot->description= "Add a new (empty) Keying Set to the active Scene"; /* callbacks */ ot->exec= add_default_keyingset_exec; @@ -189,9 +187,9 @@ static int remove_active_keyingset_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Removed Active Keying Set"); + ot->name= "Removed Active Keying Set"; ot->idname= "ANIM_OT_keying_set_remove"; - ot->description= _("Remove the active Keying Set"); + ot->description= "Remove the active Keying Set"; /* callbacks */ ot->exec= remove_active_keyingset_exec; @@ -232,9 +230,9 @@ static int add_empty_ks_path_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_path_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Empty Keying Set Path"); + ot->name= "Add Empty Keying Set Path"; ot->idname= "ANIM_OT_keying_set_path_add"; - ot->description= _("Add empty path to active Keying Set"); + ot->description= "Add empty path to active Keying Set"; /* callbacks */ ot->exec= add_empty_ks_path_exec; @@ -275,9 +273,9 @@ static int remove_active_ks_path_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_path_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Active Keying Set Path"); + ot->name= "Remove Active Keying Set Path"; ot->idname= "ANIM_OT_keying_set_path_remove"; - ot->description= _("Remove active Path from active Keying Set"); + ot->description= "Remove active Path from active Keying Set"; /* callbacks */ ot->exec= remove_active_ks_path_exec; @@ -373,7 +371,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyingset_button_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add to Keying Set"); + ot->name= "Add to Keying Set"; ot->idname= "ANIM_OT_keyingset_button_add"; /* callbacks */ @@ -384,7 +382,7 @@ void ANIM_OT_keyingset_button_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Add all elements of the array to a Keying Set.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Add all elements of the array to a Keying Set."); } /* Remove from KeyingSet Button Operator ------------------------ */ @@ -452,7 +450,7 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyingset_button_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove from Keying Set"); + ot->name= "Remove from Keying Set"; ot->idname= "ANIM_OT_keyingset_button_remove"; /* callbacks */ @@ -495,7 +493,7 @@ static int keyingset_active_menu_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_active_set (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Active Keying Set"); + ot->name= "Set Active Keying Set"; ot->idname= "ANIM_OT_keying_set_active_set"; /* callbacks */ @@ -509,7 +507,7 @@ void ANIM_OT_keying_set_active_set (wmOperatorType *ot) /* keyingset to use * - here the type is int not enum, since many of the indices here are determined dynamically */ - RNA_def_int(ot->srna, "type", 0, INT_MIN, INT_MAX, _("Keying Set Number"), _("Index (determined internally) of the Keying Set to use"), 0, 1); + RNA_def_int(ot->srna, "type", 0, INT_MIN, INT_MAX, "Keying Set Number", "Index (determined internally) of the Keying Set to use", 0, 1); } /* ******************************************* */ diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index 6369f9280e6..81ece9ddc9a 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -37,7 +37,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLF_api.h" #include "RNA_access.h" @@ -172,14 +171,14 @@ void ED_operatormacros_armature(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("ARMATURE_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ARMATURE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { WM_operatortype_macro_define(ot, "ARMATURE_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); } - ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_move", _("Extrude"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude"); RNA_boolean_set(otmacro->ptr, "forked", 0); @@ -189,7 +188,7 @@ void ED_operatormacros_armature(void) // XXX would it be nicer to just be able to have standard extrude_move, but set the forked property separate? // that would require fixing a properties bug 19733 - ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", _("Extrude Forked"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", "Extrude Forked", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude"); RNA_boolean_set(otmacro->ptr, "forked", 1); diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index e7ccd8a346b..a4b1e9a6e2c 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -51,8 +51,6 @@ #include "BLI_editVert.h" #include "BLI_ghash.h" -#include "BLF_api.h" - #include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -731,9 +729,9 @@ static int apply_armature_pose2bones_exec (bContext *C, wmOperator *op) void POSE_OT_armature_apply (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Apply Pose as Rest Pose"); + ot->name= "Apply Pose as Rest Pose"; ot->idname= "POSE_OT_armature_apply"; - ot->description= _("Apply the current pose as the new rest pose"); + ot->description= "Apply the current pose as the new rest pose"; /* callbacks */ ot->exec= apply_armature_pose2bones_exec; @@ -782,9 +780,9 @@ static int pose_visual_transform_apply_exec (bContext *C, wmOperator *UNUSED(op) void POSE_OT_visual_transform_apply (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Apply Visual Transform to Pose"); + ot->name= "Apply Visual Transform to Pose"; ot->idname= "POSE_OT_visual_transform_apply"; - ot->description= _("Apply final constrained position of pose bones to their transform."); + ot->description= "Apply final constrained position of pose bones to their transform."; /* callbacks */ ot->exec= pose_visual_transform_apply_exec; @@ -1245,9 +1243,9 @@ static int separate_armature_exec (bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_separate (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Separate Bones"); + ot->name= "Separate Bones"; ot->idname= "ARMATURE_OT_separate"; - ot->description= _("Isolate selected bones into a separate armature"); + ot->description= "Isolate selected bones into a separate armature"; /* callbacks */ ot->invoke= WM_operator_confirm; @@ -1469,9 +1467,9 @@ static int pose_select_linked_poll(bContext *C) void POSE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Connected"); + ot->name= "Select Connected"; ot->idname= "POSE_OT_select_linked"; - ot->description= _("Select bones related to selected ones by parent/child relationships"); + ot->description= "Select bones related to selected ones by parent/child relationships"; /* api callbacks */ ot->exec= NULL; @@ -1482,7 +1480,7 @@ void POSE_OT_select_linked(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); } /* **************** END Posemode stuff ********************** */ @@ -1563,9 +1561,9 @@ static int armature_select_linked_poll(bContext *C) void ARMATURE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Connected"); + ot->name= "Select Connected"; ot->idname= "ARMATURE_OT_select_linked"; - ot->description= _("Select bones related to selected ones by parent/child relationships"); + ot->description= "Select bones related to selected ones by parent/child relationships"; /* api callbacks */ ot->exec= NULL; @@ -1576,7 +1574,7 @@ void ARMATURE_OT_select_linked(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties s*/ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); } /* does bones and points */ @@ -1748,9 +1746,9 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Selected Bone(s)"); + ot->name= "Delete Selected Bone(s)"; ot->idname= "ARMATURE_OT_delete"; - ot->description= _("Remove selected bones from the armature"); + ot->description= "Remove selected bones from the armature"; /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -1997,12 +1995,12 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const short static EnumPropertyItem prop_calc_roll_types[] = { - {0, "X", 0, N_("X Axis"), ""}, - {1, "Y", 0, N_("Y Axis"), ""}, - {2, "Z", 0, N_("Z Axis"), ""}, - {5, "ACTIVE", 0, N_("Active Bone"), ""}, - {6, "VIEW", 0, N_("View Axis"), ""}, - {7, "CURSOR", 0, N_("Cursor"), ""}, + {0, "X", 0, "X Axis", ""}, + {1, "Y", 0, "Y Axis", ""}, + {2, "Z", 0, "Z Axis", ""}, + {5, "ACTIVE", 0, "Active Bone", ""}, + {6, "VIEW", 0, "View Axis", ""}, + {7, "CURSOR", 0, "Cursor", ""}, {0, NULL, 0, NULL, NULL} }; @@ -2103,9 +2101,9 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op) void ARMATURE_OT_calculate_roll(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Recalculate Roll"); + ot->name= "Recalculate Roll"; ot->idname= "ARMATURE_OT_calculate_roll"; - ot->description= _("Automatically fix alignment of select bones' axes"); + ot->description= "Automatically fix alignment of select bones' axes"; /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -2116,9 +2114,9 @@ void ARMATURE_OT_calculate_roll(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_calc_roll_types), 0, _("Type"), ""); - RNA_def_boolean(ot->srna, "axis_flip", 0, _("Flip Axis"), _("Negate the alignment axis.")); - RNA_def_boolean(ot->srna, "axis_only", 0, _("Shortest Rotation"), _("Ignore the axis direction, use the shortest rotation to align.")); + ot->prop= RNA_def_enum(ot->srna, "type", prop_calc_roll_types, 0, "Type", ""); + RNA_def_boolean(ot->srna, "axis_flip", 0, "Flip Axis", "Negate the alignment axis."); + RNA_def_boolean(ot->srna, "axis_only", 0, "Shortest Rotation", "Ignore the axis direction, use the shortest rotation to align."); } /* **************** undo for armatures ************** */ @@ -2410,9 +2408,9 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, wmEvent *e void ARMATURE_OT_click_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Click-Extrude"); + ot->name= "Click-Extrude"; ot->idname= "ARMATURE_OT_click_extrude"; - ot->description= _("Create a new bone going from the last selected joint to the mouse position"); + ot->description= "Create a new bone going from the last selected joint to the mouse position"; /* api callbacks */ ot->invoke = armature_click_extrude_invoke; @@ -2679,9 +2677,9 @@ static int armature_duplicate_selected_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Selected Bone(s)"); + ot->name= "Duplicate Selected Bone(s)"; ot->idname= "ARMATURE_OT_duplicate"; - ot->description= _("Make copies of the selected bones within the same armature"); + ot->description= "Make copies of the selected bones within the same armature"; /* api callbacks */ ot->exec = armature_duplicate_selected_exec; @@ -2953,9 +2951,9 @@ static int armature_fill_bones_exec (bContext *C, wmOperator *op) void ARMATURE_OT_fill (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Fill Between Joints"); + ot->name= "Fill Between Joints"; ot->idname= "ARMATURE_OT_fill"; - ot->description= _("Add bone between selected joint(s) and/or 3D-Cursor"); + ot->description= "Add bone between selected joint(s) and/or 3D-Cursor"; /* callbacks */ ot->exec= armature_fill_bones_exec; @@ -3132,14 +3130,14 @@ static int armature_merge_exec (bContext *C, wmOperator *op) void ARMATURE_OT_merge (wmOperatorType *ot) { static EnumPropertyItem merge_types[] = { - {1, "WITHIN_CHAIN", 0, N_("Within Chains"), ""}, + {1, "WITHIN_CHAIN", 0, "Within Chains", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Merge Bones"); + ot->name= "Merge Bones"; ot->idname= "ARMATURE_OT_merge"; - ot->description= _("Merge continuous chains of selected bones"); + ot->description= "Merge continuous chains of selected bones"; /* callbacks */ ot->invoke= WM_menu_invoke; @@ -3150,7 +3148,7 @@ void ARMATURE_OT_merge (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(merge_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", merge_types, 0, "Type", ""); } /* ************** END Add/Remove stuff in editmode ************ */ @@ -3186,9 +3184,9 @@ static int armature_hide_exec(bContext *C, wmOperator *op) void ARMATURE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide Selected Bones"); + ot->name= "Hide Selected Bones"; ot->idname= "ARMATURE_OT_hide"; - ot->description= _("Tag selected bones to not be visible in Edit Mode"); + ot->description= "Tag selected bones to not be visible in Edit Mode"; /* api callbacks */ ot->exec= armature_hide_exec; @@ -3198,7 +3196,7 @@ void ARMATURE_OT_hide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } static int armature_reveal_exec(bContext *C, wmOperator *UNUSED(op)) @@ -3226,9 +3224,9 @@ static int armature_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal Bones"); + ot->name= "Reveal Bones"; ot->idname= "ARMATURE_OT_reveal"; - ot->description= _("Unhide all bones that have been tagged to be hidden in Edit Mode"); + ot->description= "Unhide all bones that have been tagged to be hidden in Edit Mode"; /* api callbacks */ ot->exec= armature_reveal_exec; @@ -3435,9 +3433,9 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) void ARMATURE_OT_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Extrude"); + ot->name= "Extrude"; ot->idname= "ARMATURE_OT_extrude"; - ot->description= _("Create new bones from the selected joints"); + ot->description= "Create new bones from the selected joints"; /* api callbacks */ ot->exec= armature_extrude_exec; @@ -3447,7 +3445,7 @@ void ARMATURE_OT_extrude(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "forked", 0, _("Forked"), ""); + RNA_def_boolean(ot->srna, "forked", 0, "Forked", ""); } /* ********************** Bone Add ********************/ @@ -3498,9 +3496,9 @@ static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op) void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Bone"); + ot->name= "Add Bone"; ot->idname= "ARMATURE_OT_bone_primitive_add"; - ot->description= _("Add a new bone located at the 3D-Cursor"); + ot->description= "Add a new bone located at the 3D-Cursor"; /* api callbacks */ ot->exec = armature_bone_primitive_add_exec; @@ -3509,7 +3507,7 @@ void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "name", "Bone", 32, _("Name"), _("Name of the newly created bone")); + RNA_def_string(ot->srna, "name", "Bone", 32, "Name", "Name of the newly created bone"); } @@ -3588,9 +3586,9 @@ static int armature_subdivide_exec(bContext *C, wmOperator *op) void ARMATURE_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Subdivide Multi"); + ot->name= "Subdivide Multi"; ot->idname= "ARMATURE_OT_subdivide"; - ot->description= _("Break selected bones into chains of smaller bones"); + ot->description= "Break selected bones into chains of smaller bones"; /* api callbacks */ ot->exec = armature_subdivide_exec; @@ -3600,7 +3598,7 @@ void ARMATURE_OT_subdivide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* Properties */ - RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, _("Number of Cuts"), "", 1, 10); + RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10); } /* ----------- */ @@ -3690,9 +3688,9 @@ static int armature_switch_direction_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_switch_direction(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Switch Direction"); + ot->name= "Switch Direction"; ot->idname= "ARMATURE_OT_switch_direction"; - ot->description= _("Change the direction that a chain of bones points in (head <-> tail swap)"); + ot->description= "Change the direction that a chain of bones points in (head <-> tail swap)"; /* api callbacks */ ot->exec = armature_switch_direction_exec; @@ -3764,8 +3762,8 @@ static void bone_connect_to_new_parent(ListBase *edbo, EditBone *selbone, EditBo } static EnumPropertyItem prop_editarm_make_parent_types[] = { - {ARM_PAR_CONNECT, "CONNECTED", 0, N_("Connected"), ""}, - {ARM_PAR_OFFSET, "OFFSET", 0, N_("Keep Offset"), ""}, + {ARM_PAR_CONNECT, "CONNECTED", 0, "Connected", ""}, + {ARM_PAR_OFFSET, "OFFSET", 0, "Keep Offset", ""}, {0, NULL, 0, NULL, NULL} }; @@ -3865,9 +3863,9 @@ static int armature_parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEve void ARMATURE_OT_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Parent"); + ot->name= "Make Parent"; ot->idname= "ARMATURE_OT_parent_set"; - ot->description= _("Set the active bone as the parent of the selected bones"); + ot->description= "Set the active bone as the parent of the selected bones"; /* api callbacks */ ot->invoke = armature_parent_set_invoke; @@ -3877,12 +3875,12 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_editarm_make_parent_types), 0, _("ParentType"), _("Type of parenting")); + RNA_def_enum(ot->srna, "type", prop_editarm_make_parent_types, 0, "ParentType", "Type of parenting"); } static EnumPropertyItem prop_editarm_clear_parent_types[] = { - {1, "CLEAR", 0, N_("Clear Parent"), ""}, - {2, "DISCONNECT", 0, N_("Disconnect Bone"), ""}, + {1, "CLEAR", 0, "Clear Parent", ""}, + {2, "DISCONNECT", 0, "Disconnect Bone", ""}, {0, NULL, 0, NULL, NULL} }; @@ -3919,9 +3917,9 @@ static int armature_parent_clear_exec(bContext *C, wmOperator *op) void ARMATURE_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Parent"); + ot->name= "Clear Parent"; ot->idname= "ARMATURE_OT_parent_clear"; - ot->description= _("Remove the parent-child relationship between selected bones and their parents"); + ot->description= "Remove the parent-child relationship between selected bones and their parents"; /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -3931,7 +3929,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_editarm_clear_parent_types), 0, _("ClearType"), _("What way to clear parenting")); + ot->prop= RNA_def_enum(ot->srna, "type", prop_editarm_clear_parent_types, 0, "ClearType", "What way to clear parenting"); } /* **************** Selections ******************/ @@ -3956,9 +3954,9 @@ static int armature_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); + ot->name= "Select Inverse"; ot->idname= "ARMATURE_OT_select_inverse"; - ot->description= _("Flip the selection status of bones (selected -> unselected, unselected -> selected)"); + ot->description= "Flip the selection status of bones (selected -> unselected, unselected -> selected)"; /* api callbacks */ ot->exec= armature_select_inverse_exec; @@ -4016,9 +4014,9 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); + ot->name= "Select or Deselect All"; ot->idname= "ARMATURE_OT_select_all"; - ot->description= _("Toggle selection status of all bones"); + ot->description= "Toggle selection status of all bones"; /* api callbacks */ ot->exec= armature_de_select_all_exec; @@ -4091,15 +4089,15 @@ static int armature_select_hierarchy_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {BONE_SELECT_PARENT, "PARENT", 0, N_("Select Parent"), ""}, - {BONE_SELECT_CHILD, "CHILD", 0, N_("Select Child"), ""}, + {BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""}, + {BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Select Hierarchy"); + ot->name= "Select Hierarchy"; ot->idname= "ARMATURE_OT_select_hierarchy"; - ot->description= _("Select immediate parent/children of selected bones"); + ot->description= "Select immediate parent/children of selected bones"; /* api callbacks */ ot->exec= armature_select_hierarchy_exec; @@ -4109,9 +4107,9 @@ void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(direction_items), - BONE_SELECT_PARENT, _("Direction"), ""); - RNA_def_boolean(ot->srna, "extend", 0, _("Add to Selection"), ""); + RNA_def_enum(ot->srna, "direction", direction_items, + BONE_SELECT_PARENT, "Direction", ""); + RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", ""); } /* ***************** EditBone Alignment ********************* */ @@ -4236,9 +4234,9 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op) void ARMATURE_OT_align(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Align Bones"); + ot->name= "Align Bones"; ot->idname= "ARMATURE_OT_align"; - ot->description= _("Align selected bones to the active bone (or to their parent)"); + ot->description= "Align selected bones to the active bone (or to their parent)"; /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -4951,9 +4949,9 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op) void POSE_OT_scale_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Pose Scale"); + ot->name= "Clear Pose Scale"; ot->idname= "POSE_OT_scale_clear"; - ot->description = _("Reset scaling of selected bones to their default values"); + ot->description = "Reset scaling of selected bones to their default values"; /* api callbacks */ ot->exec = pose_clear_scale_exec; @@ -4972,9 +4970,9 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op) void POSE_OT_rot_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Pose Rotation"); + ot->name= "Clear Pose Rotation"; ot->idname= "POSE_OT_rot_clear"; - ot->description = _("Reset rotations of selected bones to their default values"); + ot->description = "Reset rotations of selected bones to their default values"; /* api callbacks */ ot->exec = pose_clear_rot_exec; @@ -4993,9 +4991,9 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op) void POSE_OT_loc_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Pose Location"); + ot->name= "Clear Pose Location"; ot->idname= "POSE_OT_loc_clear"; - ot->description = _("Reset locations of selected bones to their default values"); + ot->description = "Reset locations of selected bones to their default values"; /* api callbacks */ ot->exec = pose_clear_loc_exec; @@ -5014,9 +5012,9 @@ static int pose_clear_transforms_exec(bContext *C, wmOperator *op) void POSE_OT_transforms_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Pose Transforms"); + ot->name= "Clear Pose Transforms"; ot->idname= "POSE_OT_transforms_clear"; - ot->description = _("Reset location, rotation, and scaling of selected bones to their default values"); + ot->description = "Reset location, rotation, and scaling of selected bones to their default values"; /* api callbacks */ ot->exec = pose_clear_transforms_exec; @@ -5048,9 +5046,9 @@ static int pose_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); + ot->name= "Select Inverse"; ot->idname= "POSE_OT_select_inverse"; - ot->description= _("Flip the selection status of bones (selected -> unselected, unselected -> selected)"); + ot->description= "Flip the selection status of bones (selected -> unselected, unselected -> selected)"; /* api callbacks */ ot->exec= pose_select_inverse_exec; @@ -5099,9 +5097,9 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op) void POSE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); + ot->name= "Select or Deselect All"; ot->idname= "POSE_OT_select_all"; - ot->description= _("Toggle selection status of all bones"); + ot->description= "Toggle selection status of all bones"; /* api callbacks */ ot->exec= pose_de_select_all_exec; @@ -5143,9 +5141,9 @@ static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_parent(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Parent Bone"); + ot->name= "Select Parent Bone"; ot->idname= "POSE_OT_select_parent"; - ot->description= _("Select bones that are parents of the currently selected bones"); + ot->description= "Select bones that are parents of the currently selected bones"; /* api callbacks */ ot->exec= pose_select_parent_exec; @@ -5208,9 +5206,9 @@ static int pose_hide_exec(bContext *C, wmOperator *op) void POSE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide Selected"); + ot->name= "Hide Selected"; ot->idname= "POSE_OT_hide"; - ot->description= _("Tag selected bones to not be visible in Pose Mode"); + ot->description= "Tag selected bones to not be visible in Pose Mode"; /* api callbacks */ ot->exec= pose_hide_exec; @@ -5220,7 +5218,7 @@ void POSE_OT_hide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), ""); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", ""); } static int show_pose_bone_cb(Object *ob, Bone *bone, void *UNUSED(ptr)) @@ -5254,9 +5252,9 @@ static int pose_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal Selected"); + ot->name= "Reveal Selected"; ot->idname= "POSE_OT_reveal"; - ot->description= _("Unhide all bones that have been tagged to be hidden in Pose Mode"); + ot->description= "Unhide all bones that have been tagged to be hidden in Pose Mode"; /* api callbacks */ ot->exec= pose_reveal_exec; @@ -5471,9 +5469,9 @@ static int armature_flip_names_exec (bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_flip_names (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Flip Names"); + ot->name= "Flip Names"; ot->idname= "ARMATURE_OT_flip_names"; - ot->description= _("Flips (and corrects) the axis suffixes of the names of selected bones"); + ot->description= "Flips (and corrects) the axis suffixes of the names of selected bones"; /* api callbacks */ ot->exec= armature_flip_names_exec; @@ -5517,15 +5515,15 @@ static int armature_autoside_names_exec (bContext *C, wmOperator *op) void ARMATURE_OT_autoside_names (wmOperatorType *ot) { static EnumPropertyItem axis_items[]= { - {0, "XAXIS", 0, N_("X-Axis"), N_("Left/Right")}, - {1, "YAXIS", 0, N_("Y-Axis"), N_("Front/Back")}, - {2, "ZAXIS", 0, N_("Z-Axis"), N_("Top/Bottom")}, + {0, "XAXIS", 0, "X-Axis", "Left/Right"}, + {1, "YAXIS", 0, "Y-Axis", "Front/Back"}, + {2, "ZAXIS", 0, "Z-Axis", "Top/Bottom"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("AutoName by Axis"); + ot->name= "AutoName by Axis"; ot->idname= "ARMATURE_OT_autoside_names"; - ot->description= _("Automatically renames the selected bones according to which side of the target axis they fall on"); + ot->description= "Automatically renames the selected bones according to which side of the target axis they fall on"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -5536,7 +5534,7 @@ void ARMATURE_OT_autoside_names (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* settings */ - ot->prop= RNA_def_enum(ot->srna, "type", axis_items, 0, _("Axis"), _("Axis tag names with.")); + ot->prop= RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with."); } diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index b238ae3c0c0..bcd9d746a44 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -44,8 +44,6 @@ #include "BLI_graph.h" #include "BLI_ghash.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_sketch.h" @@ -2843,7 +2841,7 @@ int ED_operator_sketch_mode(const bContext *C) void SKETCH_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("delete"); + ot->name= "delete"; ot->idname= "SKETCH_OT_delete"; /* api callbacks */ @@ -2858,7 +2856,7 @@ void SKETCH_OT_delete(wmOperatorType *ot) void SKETCH_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("select"); + ot->name= "select"; ot->idname= "SKETCH_OT_select"; /* api callbacks */ @@ -2873,7 +2871,7 @@ void SKETCH_OT_select(wmOperatorType *ot) void SKETCH_OT_cancel_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= _("cancel stroke"); + ot->name= "cancel stroke"; ot->idname= "SKETCH_OT_cancel_stroke"; /* api callbacks */ @@ -2888,7 +2886,7 @@ void SKETCH_OT_cancel_stroke(wmOperatorType *ot) void SKETCH_OT_convert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("convert"); + ot->name= "convert"; ot->idname= "SKETCH_OT_convert"; /* api callbacks */ @@ -2903,7 +2901,7 @@ void SKETCH_OT_convert(wmOperatorType *ot) void SKETCH_OT_finish_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= _("end stroke"); + ot->name= "end stroke"; ot->idname= "SKETCH_OT_finish_stroke"; /* api callbacks */ @@ -2918,7 +2916,7 @@ void SKETCH_OT_finish_stroke(wmOperatorType *ot) void SKETCH_OT_draw_preview(wmOperatorType *ot) { /* identifiers */ - ot->name= _("draw preview"); + ot->name= "draw preview"; ot->idname= "SKETCH_OT_draw_preview"; /* api callbacks */ @@ -2926,7 +2924,7 @@ void SKETCH_OT_draw_preview(wmOperatorType *ot) ot->poll= ED_operator_sketch_mode_active_stroke; - RNA_def_boolean(ot->srna, "snap", 0, _("Snap"), ""); + RNA_def_boolean(ot->srna, "snap", 0, "Snap", ""); /* flags */ // ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2935,7 +2933,7 @@ void SKETCH_OT_draw_preview(wmOperatorType *ot) void SKETCH_OT_draw_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= _("draw stroke"); + ot->name= "draw stroke"; ot->idname= "SKETCH_OT_draw_stroke"; /* api callbacks */ @@ -2945,7 +2943,7 @@ void SKETCH_OT_draw_stroke(wmOperatorType *ot) ot->poll= (int (*)(bContext *))ED_operator_sketch_mode; - RNA_def_boolean(ot->srna, "snap", 0, _("Snap"), ""); + RNA_def_boolean(ot->srna, "snap", 0, "Snap", ""); /* flags */ ot->flag= OPTYPE_BLOCKING; // OPTYPE_REGISTER|OPTYPE_UNDO @@ -2954,7 +2952,7 @@ void SKETCH_OT_draw_stroke(wmOperatorType *ot) void SKETCH_OT_gesture(wmOperatorType *ot) { /* identifiers */ - ot->name= _("gesture"); + ot->name= "gesture"; ot->idname= "SKETCH_OT_gesture"; /* api callbacks */ @@ -2964,7 +2962,7 @@ void SKETCH_OT_gesture(wmOperatorType *ot) ot->poll= ED_operator_sketch_mode_gesture; - RNA_def_boolean(ot->srna, "snap", 0, _("Snap"), ""); + RNA_def_boolean(ot->srna, "snap", 0, "Snap", ""); /* flags */ ot->flag= OPTYPE_BLOCKING; // OPTYPE_UNDO diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index c6927de0f87..16888908bab 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -43,8 +43,6 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_object_types.h" @@ -720,9 +718,9 @@ static int pose_slide_exec_common (bContext *C, wmOperator *op, tPoseSlideOp *ps /* common code for defining RNA properties */ static void pose_slide_opdef_properties (wmOperatorType *ot) { - RNA_def_int(ot->srna, "prev_frame", 0, MINAFRAME, MAXFRAME, _("Previous Keyframe"), _("Frame number of keyframe immediately before the current frame."), 0, 50); - RNA_def_int(ot->srna, "next_frame", 0, MINAFRAME, MAXFRAME, _("Next Keyframe"), _("Frame number of keyframe immediately after the current frame."), 0, 50); - RNA_def_float_percentage(ot->srna, "percentage", 0.5f, 0.0f, 1.0f, _("Percentage"), _("Weighting factor for the sliding operation"), 0.3, 0.7); + RNA_def_int(ot->srna, "prev_frame", 0, MINAFRAME, MAXFRAME, "Previous Keyframe", "Frame number of keyframe immediately before the current frame.", 0, 50); + RNA_def_int(ot->srna, "next_frame", 0, MINAFRAME, MAXFRAME, "Next Keyframe", "Frame number of keyframe immediately after the current frame.", 0, 50); + RNA_def_float_percentage(ot->srna, "percentage", 0.5f, 0.0f, 1.0f, "Percentage", "Weighting factor for the sliding operation", 0.3, 0.7); } /* ------------------------------------ */ @@ -764,9 +762,9 @@ static int pose_slide_push_exec (bContext *C, wmOperator *op) void POSE_OT_push (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Push Pose"); + ot->name= "Push Pose"; ot->idname= "POSE_OT_push"; - ot->description= _("Exaggerate the current pose"); + ot->description= "Exaggerate the current pose"; /* callbacks */ ot->exec= pose_slide_push_exec; @@ -821,9 +819,9 @@ static int pose_slide_relax_exec (bContext *C, wmOperator *op) void POSE_OT_relax (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Relax Pose"); + ot->name= "Relax Pose"; ot->idname= "POSE_OT_relax"; - ot->description= _("Make the current pose more similar to its surrounding ones"); + ot->description= "Make the current pose more similar to its surrounding ones"; /* callbacks */ ot->exec= pose_slide_relax_exec; @@ -878,9 +876,9 @@ static int pose_slide_breakdown_exec (bContext *C, wmOperator *op) void POSE_OT_breakdown (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Pose Breakdowner"); + ot->name= "Pose Breakdowner"; ot->idname= "POSE_OT_breakdown"; - ot->description= _("Create a suitable breakdown pose on the current frame"); + ot->description= "Create a suitable breakdown pose on the current frame"; /* callbacks */ ot->exec= pose_slide_breakdown_exec; @@ -1233,18 +1231,18 @@ static int pose_propagate_exec (bContext *C, wmOperator *op) void POSE_OT_propagate (wmOperatorType *ot) { static EnumPropertyItem terminate_items[]= { - {POSE_PROPAGATE_SMART_HOLDS, "WHILE_HELD", 0, N_("While Held"), N_("Propagate pose to all keyframes after current frame that don't change (Default behaviour)")}, - {POSE_PROPAGATE_NEXT_KEY, "NEXT_KEY", 0, N_("To Next Keyframe"), N_("Propagate pose to first keyframe following the current frame only")}, - {POSE_PROPAGATE_LAST_KEY, "LAST_KEY", 0, N_("To Last Keyframe"), N_("Propagate pose to the last keyframe only (i.e. making action cyclic)")}, - {POSE_PROPAGATE_BEFORE_FRAME, "BEFORE_FRAME", 0, N_("Before Frame"), N_("Propagate pose to all keyframes between current frame and 'Frame' property")}, - {POSE_PROPAGATE_BEFORE_END, "BEFORE_END", 0, N_("Before Last Keyframe"), N_("Propagate pose to all keyframes from current frame until no more are found")}, - {POSE_PROPAGATE_SELECTED_MARKERS, "SELECTED_MARKERS", 0, N_("On Selected Markers"), N_("Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame")}, + {POSE_PROPAGATE_SMART_HOLDS, "WHILE_HELD", 0, "While Held", "Propagate pose to all keyframes after current frame that don't change (Default behaviour)"}, + {POSE_PROPAGATE_NEXT_KEY, "NEXT_KEY", 0, "To Next Keyframe", "Propagate pose to first keyframe following the current frame only"}, + {POSE_PROPAGATE_LAST_KEY, "LAST_KEY", 0, "To Last Keyframe", "Propagate pose to the last keyframe only (i.e. making action cyclic)"}, + {POSE_PROPAGATE_BEFORE_FRAME, "BEFORE_FRAME", 0, "Before Frame", "Propagate pose to all keyframes between current frame and 'Frame' property"}, + {POSE_PROPAGATE_BEFORE_END, "BEFORE_END", 0, "Before Last Keyframe", "Propagate pose to all keyframes from current frame until no more are found"}, + {POSE_PROPAGATE_SELECTED_MARKERS, "SELECTED_MARKERS", 0, "On Selected Markers", "Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Propagate Pose"); + ot->name= "Propagate Pose"; ot->idname= "POSE_OT_propagate"; - ot->description= _("Copy selected aspects of the current pose to subsequent poses already keyframed"); + ot->description= "Copy selected aspects of the current pose to subsequent poses already keyframed"; /* callbacks */ ot->exec= pose_propagate_exec; @@ -1255,8 +1253,8 @@ void POSE_OT_propagate (wmOperatorType *ot) /* properties */ // TODO: add "fade out" control for tapering off amount of propagation as time goes by? - ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(terminate_items), POSE_PROPAGATE_SMART_HOLDS, _("Terminate Mode"), _("Method used to determine when to stop propagating pose to keyframes")); - RNA_def_float(ot->srna, "end_frame", 250.0, FLT_MIN, FLT_MAX, _("End Frame"), _("Frame to stop propagating frames to (for 'Before Frame' mode)"), 1.0, 250.0); + ot->prop= RNA_def_enum(ot->srna, "mode", terminate_items, POSE_PROPAGATE_SMART_HOLDS, "Terminate Mode", "Method used to determine when to stop propagating pose to keyframes"); + RNA_def_float(ot->srna, "end_frame", 250.0, FLT_MIN, FLT_MAX, "End Frame", "Frame to stop propagating frames to (for 'Before Frame' mode)", 1.0, 250.0); } /* **************************************************** */ diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 61435602446..81da047df36 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -234,9 +234,9 @@ static int poselib_new_exec (bContext *C, wmOperator *UNUSED(op)) void POSELIB_OT_new (wmOperatorType *ot) { /* identifiers */ - ot->name = _("New Pose Library"); + ot->name = "New Pose Library"; ot->idname = "POSELIB_OT_new"; - ot->description = _("Add New Pose Library to active Object"); + ot->description = "Add New Pose Library to active Object"; /* callbacks */ ot->exec = poselib_new_exec; @@ -269,9 +269,9 @@ static int poselib_unlink_exec (bContext *C, wmOperator *UNUSED(op)) void POSELIB_OT_unlink (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Unlink Pose Library"); + ot->name = "Unlink Pose Library"; ot->idname = "POSELIB_OT_unlink"; - ot->description = _("Remove Pose Library from active Object"); + ot->description = "Remove Pose Library from active Object"; /* callbacks */ ot->exec = poselib_unlink_exec; @@ -355,9 +355,9 @@ static int poselib_sanitise_exec (bContext *C, wmOperator *op) void POSELIB_OT_action_sanitise (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Sanitise Pose Library Action"); + ot->name = "Sanitise Pose Library Action"; ot->idname = "POSELIB_OT_action_sanitise"; - ot->description = _("Make action suitable for use as a Pose Library"); + ot->description = "Make action suitable for use as a Pose Library"; /* callbacks */ ot->exec = poselib_sanitise_exec; @@ -481,9 +481,9 @@ static int poselib_add_exec (bContext *C, wmOperator *op) void POSELIB_OT_pose_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("PoseLib Add Pose"); + ot->name= "PoseLib Add Pose"; ot->idname= "POSELIB_OT_pose_add"; - ot->description= _("Add the current Pose to the active Pose Library"); + ot->description= "Add the current Pose to the active Pose Library"; /* api callbacks */ ot->invoke= poselib_add_menu_invoke; @@ -494,8 +494,8 @@ void POSELIB_OT_pose_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "frame", 1, 0, INT_MAX, _("Frame"), _("Frame to store pose on"), 0, INT_MAX); - RNA_def_string(ot->srna, "name", "Pose", 64, _("Pose Name"), _("Name of newly added Pose")); + RNA_def_int(ot->srna, "frame", 1, 0, INT_MAX, "Frame", "Frame to store pose on", 0, INT_MAX); + RNA_def_string(ot->srna, "name", "Pose", 64, "Pose Name", "Name of newly added Pose"); } /* ----- */ @@ -587,9 +587,9 @@ void POSELIB_OT_pose_remove (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("PoseLib Remove Pose"); + ot->name= "PoseLib Remove Pose"; ot->idname= "POSELIB_OT_pose_remove"; - ot->description= _("Remove nth pose from the active Pose Library"); + ot->description= "Remove nth pose from the active Pose Library"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -600,7 +600,7 @@ void POSELIB_OT_pose_remove (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "pose", DummyRNA_DEFAULT_items, 0, _("Pose"), _("The pose to remove")); + prop= RNA_def_enum(ot->srna, "pose", DummyRNA_DEFAULT_items, 0, "Pose", "The pose to remove"); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); ot->prop= prop; } @@ -677,9 +677,9 @@ void POSELIB_OT_pose_rename (wmOperatorType *ot) }; /* identifiers */ - ot->name= _("PoseLib Rename Pose"); + ot->name= "PoseLib Rename Pose"; ot->idname= "POSELIB_OT_pose_rename"; - ot->description= _("Rename specified pose from the active Pose Library"); + ot->description= "Rename specified pose from the active Pose Library"; /* api callbacks */ ot->invoke= poselib_rename_invoke; @@ -1604,9 +1604,9 @@ static int poselib_preview_exec (bContext *C, wmOperator *op) void POSELIB_OT_browse_interactive (wmOperatorType *ot) { /* identifiers */ - ot->name= _("PoseLib Browse Poses"); + ot->name= "PoseLib Browse Poses"; ot->idname= "POSELIB_OT_browse_interactive"; - ot->description= _("Interactively browse poses in 3D-View"); + ot->description= "Interactively browse poses in 3D-View"; /* callbacks */ ot->invoke= poselib_preview_invoke; @@ -1620,7 +1620,7 @@ void POSELIB_OT_browse_interactive (wmOperatorType *ot) /* properties */ // TODO: make the pose_index into a proper enum instead of a cryptic int... - ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, _("Pose"), _("Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)"), 0, INT_MAX); + ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); // XXX: percentage vs factor? /* not used yet */ @@ -1630,9 +1630,9 @@ void POSELIB_OT_browse_interactive (wmOperatorType *ot) void POSELIB_OT_apply_pose (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Apply Pose Library Pose"); + ot->name = "Apply Pose Library Pose"; ot->idname = "POSELIB_OT_apply_pose"; - ot->description = _("Apply specified Pose Library pose to the rig"); + ot->description = "Apply specified Pose Library pose to the rig"; /* callbacks */ ot->exec= poselib_preview_exec; @@ -1643,5 +1643,5 @@ void POSELIB_OT_apply_pose (wmOperatorType *ot) /* properties */ // TODO: make the pose_index into a proper enum instead of a cryptic int... - ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, _("Pose"), _("Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)"), 0, INT_MAX); + ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); } diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 1c4740a7c4d..83285d3634a 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -41,8 +41,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" @@ -237,9 +235,9 @@ static int pose_calculate_paths_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_paths_calculate (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Calculate Bone Paths"); + ot->name= "Calculate Bone Paths"; ot->idname= "POSE_OT_paths_calculate"; - ot->description= _("Calculate paths for the selected bones"); + ot->description= "Calculate paths for the selected bones"; /* api callbacks */ ot->exec= pose_calculate_paths_exec; @@ -305,9 +303,9 @@ static int pose_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_paths_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Bone Paths"); + ot->name= "Clear Bone Paths"; ot->idname= "POSE_OT_paths_clear"; - ot->description= _("Clear path caches for selected bones"); + ot->description= "Clear path caches for selected bones"; /* api callbacks */ ot->exec= pose_clear_paths_exec; @@ -365,9 +363,9 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op void POSE_OT_select_constraint_target(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Constraint Target"); + ot->name= "Select Constraint Target"; ot->idname= "POSE_OT_select_constraint_target"; - ot->description= _("Select bones used as targets for the currently selected bones"); + ot->description= "Select bones used as targets for the currently selected bones"; /* api callbacks */ ot->exec= pose_select_constraint_target_exec; @@ -436,15 +434,15 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op) void POSE_OT_select_hierarchy(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {BONE_SELECT_PARENT, "PARENT", 0, N_("Select Parent"), ""}, - {BONE_SELECT_CHILD, "CHILD", 0, N_("Select Child"), ""}, + {BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""}, + {BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Select Hierarchy"); + ot->name= "Select Hierarchy"; ot->idname= "POSE_OT_select_hierarchy"; - ot->description= _("Select immediate parent/children of selected bones"); + ot->description= "Select immediate parent/children of selected bones"; /* api callbacks */ ot->exec= pose_select_hierarchy_exec; @@ -454,8 +452,8 @@ void POSE_OT_select_hierarchy(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(direction_items), BONE_SELECT_PARENT, _("Direction"), ""); - RNA_def_boolean(ot->srna, "extend", 0, _("Add to Selection"), ""); + ot->prop= RNA_def_enum(ot->srna, "direction", direction_items, BONE_SELECT_PARENT, "Direction", ""); + RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", ""); } @@ -655,15 +653,15 @@ static int pose_select_grouped_exec (bContext *C, wmOperator *op) void POSE_OT_select_grouped (wmOperatorType *ot) { static EnumPropertyItem prop_select_grouped_types[] = { - {0, "LAYER", 0, N_("Layer"), N_("Shared layers")}, - {1, "GROUP", 0, N_("Group"), N_("Shared group")}, - {2, "KEYINGSET", 0, N_("Keying Set"), N_("All bones affected by active Keying Set")}, + {0, "LAYER", 0, "Layer", "Shared layers"}, + {1, "GROUP", 0, "Group", "Shared group"}, + {2, "KEYINGSET", 0, "Keying Set", "All bones affected by active Keying Set"}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Select Grouped"); - ot->description = _("Select all visible bones grouped by similar properties"); + ot->name= "Select Grouped"; + ot->description = "Select all visible bones grouped by similar properties"; ot->idname= "POSE_OT_select_grouped"; /* api callbacks */ @@ -675,8 +673,8 @@ void POSE_OT_select_grouped (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_grouped_types), 0, _("Type"), ""); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); + ot->prop= RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); } @@ -722,9 +720,9 @@ static int pose_bone_flip_active_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_flip_active(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Flip Selected Active Bone"); + ot->name= "Flip Selected Active Bone"; ot->idname= "POSE_OT_select_flip_active"; - ot->description= _("Activate the bone with a flipped name."); + ot->description= "Activate the bone with a flipped name."; /* api callbacks */ ot->exec= pose_bone_flip_active_exec; @@ -1130,9 +1128,9 @@ static int pose_copy_exec (bContext *C, wmOperator *op) void POSE_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Pose"); + ot->name= "Copy Pose"; ot->idname= "POSE_OT_copy"; - ot->description= _("Copies the current pose of the selected bones to copy/paste buffer"); + ot->description= "Copies the current pose of the selected bones to copy/paste buffer"; /* api callbacks */ ot->exec= pose_copy_exec; @@ -1217,9 +1215,9 @@ static int pose_paste_exec (bContext *C, wmOperator *op) void POSE_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Pose"); + ot->name= "Paste Pose"; ot->idname= "POSE_OT_paste"; - ot->description= _("Pastes the stored pose on to the current pose"); + ot->description= "Pastes the stored pose on to the current pose"; /* api callbacks */ ot->exec= pose_paste_exec; @@ -1229,8 +1227,8 @@ void POSE_OT_paste (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "flipped", 0, _("Flipped on X-Axis"), _("Paste the stored pose flipped on to current pose")); - RNA_def_boolean(ot->srna, "selected_mask", 1, _("On Selected Only"), _("Only paste the stored pose on to selected bones in the current pose")); + RNA_def_boolean(ot->srna, "flipped", 0, "Flipped on X-Axis", "Paste the stored pose flipped on to current pose"); + RNA_def_boolean(ot->srna, "selected_mask", 1, "On Selected Only", "Only paste the stored pose on to selected bones in the current pose"); } /* ********************************************** */ @@ -1263,9 +1261,9 @@ static int pose_group_add_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Bone Group"); + ot->name= "Add Bone Group"; ot->idname= "POSE_OT_group_add"; - ot->description= _("Add a new bone group"); + ot->description= "Add a new bone group"; /* api callbacks */ ot->exec= pose_group_add_exec; @@ -1303,9 +1301,9 @@ static int pose_group_remove_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Bone Group"); + ot->name= "Remove Bone Group"; ot->idname= "POSE_OT_group_remove"; - ot->description= _("Removes the active bone group"); + ot->description= "Removes the active bone group"; /* api callbacks */ ot->exec= pose_group_remove_exec; @@ -1418,9 +1416,9 @@ static int pose_group_assign_exec (bContext *C, wmOperator *op) void POSE_OT_group_assign (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Selected to Bone Group"); + ot->name= "Add Selected to Bone Group"; ot->idname= "POSE_OT_group_assign"; - ot->description= _("Add selected bones to the chosen bone group"); + ot->description= "Add selected bones to the chosen bone group"; /* api callbacks */ ot->invoke= pose_groups_menu_invoke; @@ -1431,7 +1429,7 @@ void POSE_OT_group_assign (wmOperatorType *ot) ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "type", 0, 0, 10, _("Bone Group Index"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "type", 0, 0, 10, "Bone Group Index", "", 0, INT_MAX); } @@ -1474,9 +1472,9 @@ static int pose_group_unassign_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_unassign (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Selected from Bone Groups"); + ot->name= "Remove Selected from Bone Groups"; ot->idname= "POSE_OT_group_unassign"; - ot->description= _("Remove selected bones from all bone groups"); + ot->description= "Remove selected bones from all bone groups"; /* api callbacks */ ot->exec= pose_group_unassign_exec; @@ -1697,9 +1695,9 @@ static int pose_group_select_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_select (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Bones of Bone Group"); + ot->name= "Select Bones of Bone Group"; ot->idname= "POSE_OT_group_select"; - ot->description= _("Select bones in active Bone Group"); + ot->description= "Select bones in active Bone Group"; /* api callbacks */ ot->exec= pose_group_select_exec; @@ -1735,9 +1733,9 @@ static int pose_group_deselect_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_deselect (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Deselect Bone Group"); + ot->name= "Deselect Bone Group"; ot->idname= "POSE_OT_group_deselect"; - ot->description= _("Deselect bones of active Bone Group"); + ot->description= "Deselect bones of active Bone Group"; /* api callbacks */ ot->exec= pose_group_deselect_exec; @@ -1780,9 +1778,9 @@ static int pose_flip_names_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_flip_names (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Flip Names"); + ot->name= "Flip Names"; ot->idname= "POSE_OT_flip_names"; - ot->description= _("Flips (and corrects) the axis suffixes of the the names of selected bones"); + ot->description= "Flips (and corrects) the axis suffixes of the the names of selected bones"; /* api callbacks */ ot->exec= pose_flip_names_exec; @@ -1827,15 +1825,15 @@ static int pose_autoside_names_exec (bContext *C, wmOperator *op) void POSE_OT_autoside_names (wmOperatorType *ot) { static EnumPropertyItem axis_items[]= { - {0, "XAXIS", 0, N_("X-Axis"), N_("Left/Right")}, - {1, "YAXIS", 0, N_("Y-Axis"), N_("Front/Back")}, - {2, "ZAXIS", 0, N_("Z-Axis"), N_("Top/Bottom")}, + {0, "XAXIS", 0, "X-Axis", "Left/Right"}, + {1, "YAXIS", 0, "Y-Axis", "Front/Back"}, + {2, "ZAXIS", 0, "Z-Axis", "Top/Bottom"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("AutoName by Axis"); + ot->name= "AutoName by Axis"; ot->idname= "POSE_OT_autoside_names"; - ot->description= _("Automatically renames the selected bones according to which side of the target axis they fall on"); + ot->description= "Automatically renames the selected bones according to which side of the target axis they fall on"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1846,7 +1844,7 @@ void POSE_OT_autoside_names (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* settings */ - ot->prop= RNA_def_enum(ot->srna, "axis", RNA_enum_items_gettexted(axis_items), 0, _("Axis"), _("Axis tag names with.")); + ot->prop= RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Axis tag names with."); } /* ********************************************** */ @@ -1932,9 +1930,9 @@ static int pose_armature_layers_showall_exec (bContext *C, wmOperator *op) void ARMATURE_OT_layers_show_all (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Show All Layers"); + ot->name= "Show All Layers"; ot->idname= "ARMATURE_OT_layers_show_all"; - ot->description= _("Make all armature layers visible"); + ot->description= "Make all armature layers visible"; /* callbacks */ ot->exec= pose_armature_layers_showall_exec; @@ -1944,7 +1942,7 @@ void ARMATURE_OT_layers_show_all (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop = RNA_def_boolean(ot->srna, "all", 1, _("All Layers"), _("Enable all layers or just the first 16 (top row)")); + ot->prop = RNA_def_boolean(ot->srna, "all", 1, "All Layers", "Enable all layers or just the first 16 (top row)"); } /* ------------------- */ @@ -1998,9 +1996,9 @@ static int pose_armature_layers_exec (bContext *C, wmOperator *op) void POSE_OT_armature_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change Armature Layers"); + ot->name= "Change Armature Layers"; ot->idname= "POSE_OT_armature_layers"; - ot->description= _("Change the visible armature layers"); + ot->description= "Change the visible armature layers"; /* callbacks */ ot->invoke= pose_armature_layers_invoke; @@ -2011,15 +2009,15 @@ void POSE_OT_armature_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers to make visible")); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers to make visible"); } void ARMATURE_OT_armature_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change Armature Layers"); + ot->name= "Change Armature Layers"; ot->idname= "ARMATURE_OT_armature_layers"; - ot->description= _("Change the visible armature layers"); + ot->description= "Change the visible armature layers"; /* callbacks */ ot->invoke= pose_armature_layers_invoke; @@ -2030,7 +2028,7 @@ void ARMATURE_OT_armature_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers to make visible")); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers to make visible"); } /* ------------------- */ @@ -2092,9 +2090,9 @@ static int pose_bone_layers_exec (bContext *C, wmOperator *op) void POSE_OT_bone_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change Bone Layers"); + ot->name= "Change Bone Layers"; ot->idname= "POSE_OT_bone_layers"; - ot->description= _("Change the layers that the selected bones belong to"); + ot->description= "Change the layers that the selected bones belong to"; /* callbacks */ ot->invoke= pose_bone_layers_invoke; @@ -2105,7 +2103,7 @@ void POSE_OT_bone_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers that bone belongs to")); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers that bone belongs to"); } /* ------------------- */ @@ -2164,9 +2162,9 @@ static int armature_bone_layers_exec (bContext *C, wmOperator *op) void ARMATURE_OT_bone_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change Bone Layers"); + ot->name= "Change Bone Layers"; ot->idname= "ARMATURE_OT_bone_layers"; - ot->description= _("Change the layers that the selected bones belong to"); + ot->description= "Change the layers that the selected bones belong to"; /* callbacks */ ot->invoke= armature_bone_layers_invoke; @@ -2177,7 +2175,7 @@ void ARMATURE_OT_bone_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers that bone belongs to")); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers that bone belongs to"); } /* ********************************************** */ @@ -2233,9 +2231,9 @@ static int pose_flip_quats_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_quaternions_flip (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Flip Quats"); + ot->name = "Flip Quats"; ot->idname= "POSE_OT_quaternions_flip"; - ot->description= _("Flip quaternion values to achieve desired rotations, while maintaining the same orientations"); + ot->description= "Flip quaternion values to achieve desired rotations, while maintaining the same orientations"; /* callbacks */ ot->exec= pose_flip_quats_exec; diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index 6e975e20cd7..9bad02eca1f 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript index c23773f7fb0..efb56ce5466 100644 --- a/source/blender/editors/curve/SConscript +++ b/source/blender/editors/curve/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu ../../blenloader' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index facd4e8a4a3..b35085ff64d 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -56,8 +56,6 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_depsgraph.h" @@ -1404,7 +1402,7 @@ static int separate_exec(bContext *C, wmOperator *op) void CURVE_OT_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Separate"); + ot->name= "Separate"; ot->idname= "CURVE_OT_separate"; /* api callbacks */ @@ -2012,8 +2010,8 @@ static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_switch_direction(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Switch Direction"); - ot->description= _("Switch direction of selected splines"); + ot->name= "Switch Direction"; + ot->description= "Switch direction of selected splines"; ot->idname= "CURVE_OT_switch_direction"; /* api callbacks */ @@ -2060,8 +2058,8 @@ static int set_goal_weight_exec(bContext *C, wmOperator *op) void CURVE_OT_spline_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Goal Weight"); - ot->description= _("Set softbody goal weight for selected points"); + ot->name= "Set Goal Weight"; + ot->description= "Set softbody goal weight for selected points"; ot->idname= "CURVE_OT_spline_weight_set"; /* api callbacks */ @@ -2073,7 +2071,7 @@ void CURVE_OT_spline_weight_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_factor(ot->srna, "weight", 1.0f, 0.0f, 1.0f, _("Weight"), "", 0.0f, 1.0f); + RNA_def_float_factor(ot->srna, "weight", 1.0f, 0.0f, 1.0f, "Weight", "", 0.0f, 1.0f); } /******************* set radius operator ******************/ @@ -2112,8 +2110,8 @@ static int set_radius_exec(bContext *C, wmOperator *op) void CURVE_OT_radius_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Curve Radius"); - ot->description= _("Set per-point radius which is used for bevel tapering"); + ot->name= "Set Curve Radius"; + ot->description= "Set per-point radius which is used for bevel tapering"; ot->idname= "CURVE_OT_radius_set"; /* api callbacks */ @@ -2125,7 +2123,7 @@ void CURVE_OT_radius_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, _("Radius"), "", 0.0001f, 10.0f); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, "Radius", "", 0.0001f, 10.0f); } /********************* smooth operator ********************/ @@ -2188,8 +2186,8 @@ static int smooth_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Smooth"); - ot->description= _("Flatten angles of selected points"); + ot->name= "Smooth"; + ot->description= "Flatten angles of selected points"; ot->idname= "CURVE_OT_smooth"; /* api callbacks */ @@ -2354,8 +2352,8 @@ static int smooth_radius_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_smooth_radius(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Smooth Curve Radius"); - ot->description= _("Flatten radiuses of selected points"); + ot->name= "Smooth Curve Radius"; + ot->description= "Flatten radiuses of selected points"; ot->idname= "CURVE_OT_smooth_radius"; /* api clastbacks */ @@ -2508,7 +2506,7 @@ static int de_select_first_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_de_select_first(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect First"); + ot->name= "Select or Deselect First"; ot->idname= "CURVE_OT_de_select_first"; /* api cfirstbacks */ @@ -2532,7 +2530,7 @@ static int de_select_last_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_de_select_last(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect Last"); + ot->name= "Select or Deselect Last"; ot->idname= "CURVE_OT_de_select_last"; /* api clastbacks */ @@ -2610,7 +2608,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op) void CURVE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); + ot->name= "Select or Deselect All"; ot->idname= "CURVE_OT_select_all"; /* api callbacks */ @@ -2684,7 +2682,7 @@ static int hide_exec(bContext *C, wmOperator *op) void CURVE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide Selected"); + ot->name= "Hide Selected"; ot->idname= "CURVE_OT_hide"; /* api callbacks */ @@ -2695,7 +2693,7 @@ void CURVE_OT_hide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } /********************** reveal operator *********************/ @@ -2744,7 +2742,7 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal Hidden"); + ot->name= "Reveal Hidden"; ot->idname= "CURVE_OT_reveal"; /* api callbacks */ @@ -2802,7 +2800,7 @@ static int select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); + ot->name= "Select Inverse"; ot->idname= "CURVE_OT_select_inverse"; /* api callbacks */ @@ -3241,8 +3239,8 @@ static int subdivide_exec(bContext *C, wmOperator *op) void CURVE_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Subdivide"); - ot->description= _("Subdivide selected segments"); + ot->name= "Subdivide"; + ot->description= "Subdivide selected segments"; ot->idname= "CURVE_OT_subdivide"; /* api callbacks */ @@ -3252,7 +3250,7 @@ void CURVE_OT_subdivide(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, _("Number of cuts"), "", 1, 10); + RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of cuts", "", 1, 10); } /******************** find nearest ************************/ @@ -3555,16 +3553,16 @@ static int set_spline_type_exec(bContext *C, wmOperator *op) void CURVE_OT_spline_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {CU_POLY, "POLY", 0, N_("Poly"), ""}, - {CU_BEZIER, "BEZIER", 0, N_("Bezier"), ""}, -// {CU_CARDINAL, "CARDINAL", 0, N_("Cardinal"), ""}, -// {CU_BSPLINE, "B_SPLINE", 0, N_("B-Spline"), ""}, - {CU_NURBS, "NURBS", 0, N_("NURBS"), ""}, + {CU_POLY, "POLY", 0, "Poly", ""}, + {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, +// {CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""}, +// {CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""}, + {CU_NURBS, "NURBS", 0, "NURBS", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Set Spline Type"); - ot->description = _("Set type of active spline"); + ot->name= "Set Spline Type"; + ot->description = "Set type of active spline"; ot->idname= "CURVE_OT_spline_type_set"; /* api callbacks */ @@ -3576,7 +3574,7 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), CU_POLY, _("Type"), _("Spline type")); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, CU_POLY, "Type", "Spline type"); } /***************** set handle type operator *******************/ @@ -3598,16 +3596,16 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot) { /* keep in sync with graphkeys_handle_type_items */ static EnumPropertyItem editcurve_handle_type_items[]= { - {HD_AUTO, "AUTOMATIC", 0, N_("Automatic"), ""}, - {HD_VECT, "VECTOR", 0, N_("Vector"), ""}, - {5, "ALIGNED", 0, N_("Aligned"), ""}, - {6, "FREE_ALIGN", 0, N_("Free"), ""}, - {3, "TOGGLE_FREE_ALIGN", 0, N_("Toggle Free/Align"), ""}, + {HD_AUTO, "AUTOMATIC", 0, "Automatic", ""}, + {HD_VECT, "VECTOR", 0, "Vector", ""}, + {5, "ALIGNED", 0, "Aligned", ""}, + {6, "FREE_ALIGN", 0, "Free", ""}, + {3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Set Handle Type"); - ot->description = _("Set type of handles for selected control points"); + ot->name= "Set Handle Type"; + ot->description = "Set type of handles for selected control points"; ot->idname= "CURVE_OT_handle_type_set"; /* api callbacks */ @@ -3619,7 +3617,7 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(editcurve_handle_type_items), 1, _("Type"), _("Spline type")); + ot->prop= RNA_def_enum(ot->srna, "type", editcurve_handle_type_items, 1, "Type", "Spline type"); } /***************** make segment operator **********************/ @@ -4141,7 +4139,7 @@ static int make_segment_exec(bContext *C, wmOperator *op) void CURVE_OT_make_segment(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Segment"); + ot->name= "Make Segment"; ot->idname= "CURVE_OT_make_segment"; /* api callbacks */ @@ -4371,7 +4369,7 @@ static int spin_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_spin(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Spin"); + ot->name= "Spin"; ot->idname= "CURVE_OT_spin"; /* api callbacks */ @@ -4382,8 +4380,8 @@ void CURVE_OT_spin(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, _("Center"), _("Center in global view space"), -FLT_MAX, FLT_MAX); - RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, _("Axis"), _("Axis in global view space"), -FLT_MAX, FLT_MAX); + RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, "Center", "Center in global view space", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -FLT_MAX, FLT_MAX); } /***************** add vertex operator **********************/ @@ -4682,7 +4680,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event) void CURVE_OT_vertex_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Vertex"); + ot->name= "Add Vertex"; ot->idname= "CURVE_OT_vertex_add"; /* api callbacks */ @@ -4694,7 +4692,7 @@ void CURVE_OT_vertex_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Location to add new vertex at."), -1e4, 1e4); + RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Location to add new vertex at.", -1e4, 1e4); } /***************** extrude operator **********************/ @@ -4742,8 +4740,8 @@ static int extrude_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Extrude"); - ot->description = _("Extrude selected control point(s) and move"); + ot->name= "Extrude"; + ot->description = "Extrude selected control point(s) and move"; ot->idname= "CURVE_OT_extrude"; /* api callbacks */ @@ -4755,7 +4753,7 @@ void CURVE_OT_extrude(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /***************** make cyclic operator **********************/ @@ -4866,13 +4864,13 @@ static int toggle_cyclic_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void CURVE_OT_cyclic_toggle(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {0, "CYCLIC_U", 0, N_("Cyclic U"), ""}, - {1, "CYCLIC_V", 0, N_("Cyclic V"), ""}, + {0, "CYCLIC_U", 0, "Cyclic U", ""}, + {1, "CYCLIC_V", 0, "Cyclic V", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Toggle Cyclic"); - ot->description = _("Make active spline closed/opened loop"); + ot->name= "Toggle Cyclic"; + ot->description = "Make active spline closed/opened loop"; ot->idname= "CURVE_OT_cyclic_toggle"; /* api callbacks */ @@ -4884,7 +4882,7 @@ void CURVE_OT_cyclic_toggle(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "direction", direction_items, 0, _("Direction"), _("Direction to make surface cyclic in.")); + RNA_def_enum(ot->srna, "direction", direction_items, 0, "Direction", "Direction to make surface cyclic in."); } /***************** select linked operator ******************/ @@ -4948,7 +4946,7 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void CURVE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked All"); + ot->name= "Select Linked All"; ot->idname= "CURVE_OT_select_linked"; /* api callbacks */ @@ -5008,7 +5006,7 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event void CURVE_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked"); + ot->name= "Select Linked"; ot->idname= "CURVE_OT_select_linked_pick"; /* api callbacks */ @@ -5019,7 +5017,7 @@ void CURVE_OT_select_linked_pick(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "deselect", 0, _("Deselect"), _("Deselect linked control points rather than selecting them.")); + RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect linked control points rather than selecting them."); } /***************** select row operator **********************/ @@ -5086,7 +5084,7 @@ static int select_row_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_row(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Control Point Row"); + ot->name= "Select Control Point Row"; ot->idname= "CURVE_OT_select_row"; /* api callbacks */ @@ -5113,7 +5111,7 @@ static int select_next_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_next(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Next"); + ot->name= "Select Next"; ot->idname= "CURVE_OT_select_next"; /* api callbacks */ @@ -5140,7 +5138,7 @@ static int select_previous_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_previous(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Previous"); + ot->name= "Select Previous"; ot->idname= "CURVE_OT_select_previous"; /* api callbacks */ @@ -5227,7 +5225,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select More"); + ot->name= "Select More"; ot->idname= "CURVE_OT_select_more"; /* api callbacks */ @@ -5388,7 +5386,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Less"); + ot->name= "Select Less"; ot->idname= "CURVE_OT_select_less"; /* api callbacks */ @@ -5451,7 +5449,7 @@ static int select_random_exec(bContext *C, wmOperator *op) void CURVE_OT_select_random(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Random"); + ot->name= "Select Random"; ot->idname= "CURVE_OT_select_random"; /* api callbacks */ @@ -5462,8 +5460,8 @@ void CURVE_OT_select_random(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, _("Percent"), _("Percentage of elements to select randomly."), 0.f, 100.0f); - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend Selection"), _("Extend selection instead of deselecting everything first.")); + RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, "Percent", "Percentage of elements to select randomly.", 0.f, 100.0f); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend Selection", "Extend selection instead of deselecting everything first."); } /********************* every nth number of point *******************/ @@ -5576,7 +5574,7 @@ static int select_nth_exec(bContext *C, wmOperator *op) void CURVE_OT_select_nth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Nth"); + ot->name= "Select Nth"; ot->description= ""; ot->idname= "CURVE_OT_select_nth"; @@ -5587,7 +5585,7 @@ void CURVE_OT_select_nth(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "nth", 2, 2, 100, _("Nth Selection"), "", 1, INT_MAX); + RNA_def_int(ot->srna, "nth", 2, 2, 100, "Nth Selection", "", 1, INT_MAX); } /********************** add duplicate operator *********************/ @@ -5615,8 +5613,8 @@ static int duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Curve"); - ot->description = _("Duplicate selected control points and segments between them"); + ot->name= "Duplicate Curve"; + ot->description = "Duplicate selected control points and segments between them"; ot->idname= "CURVE_OT_duplicate"; /* api callbacks */ @@ -5628,7 +5626,7 @@ void CURVE_OT_duplicate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /********************** delete operator *********************/ @@ -5975,14 +5973,14 @@ static int delete_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_delete(wmOperatorType *ot) { static EnumPropertyItem type_items[] = { - {0, "SELECTED", 0, N_("Select"), ""}, - {1, "SEGMENT", 0, N_("Segment"), ""}, - {2, "ALL", 0, N_("All"), ""}, + {0, "SELECTED", 0, "Select", ""}, + {1, "SEGMENT", 0, "Segment", ""}, + {2, "ALL", 0, "All", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Delete"); - ot->description = _("Delete selected control points or segments"); + ot->name= "Delete"; + ot->description = "Delete selected control points or segments"; ot->idname= "CURVE_OT_delete"; /* api callbacks */ @@ -5994,7 +5992,7 @@ void CURVE_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", type_items, 0, _("Type"), _("Which elements to delete.")); + RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Which elements to delete."); } /********************** shade smooth/flat operator *********************/ @@ -6025,7 +6023,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op) void CURVE_OT_shade_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shade Smooth"); + ot->name= "Shade Smooth"; ot->idname= "CURVE_OT_shade_smooth"; /* api callbacks */ @@ -6039,7 +6037,7 @@ void CURVE_OT_shade_smooth(wmOperatorType *ot) void CURVE_OT_shade_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shade Flat"); + ot->name= "Shade Flat"; ot->idname= "CURVE_OT_shade_flat"; /* api callbacks */ @@ -6621,8 +6619,8 @@ static int add_primitive_bezier_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_bezier_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Bezier"); - ot->description= _("Construct a Bezier Curve"); + ot->name= "Add Bezier"; + ot->description= "Construct a Bezier Curve"; ot->idname= "CURVE_OT_primitive_bezier_curve_add"; /* api callbacks */ @@ -6644,8 +6642,8 @@ static int add_primitive_bezier_circle_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_bezier_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Bezier Circle"); - ot->description= _("Construct a Bezier Circle"); + ot->name= "Add Bezier Circle"; + ot->description= "Construct a Bezier Circle"; ot->idname= "CURVE_OT_primitive_bezier_circle_add"; /* api callbacks */ @@ -6667,8 +6665,8 @@ static int add_primitive_nurbs_curve_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_nurbs_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Nurbs Curve"); - ot->description= _("Construct a Nurbs Curve"); + ot->name= "Add Nurbs Curve"; + ot->description= "Construct a Nurbs Curve"; ot->idname= "CURVE_OT_primitive_nurbs_curve_add"; /* api callbacks */ @@ -6690,8 +6688,8 @@ static int add_primitive_nurbs_circle_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_nurbs_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Nurbs Circle"); - ot->description= _("Construct a Nurbs Circle"); + ot->name= "Add Nurbs Circle"; + ot->description= "Construct a Nurbs Circle"; ot->idname= "CURVE_OT_primitive_nurbs_circle_add"; /* api callbacks */ @@ -6713,8 +6711,8 @@ static int add_primitive_curve_path_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_nurbs_path_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Path"); - ot->description= _("Construct a Path"); + ot->name= "Add Path"; + ot->description= "Construct a Path"; ot->idname= "CURVE_OT_primitive_nurbs_path_add"; /* api callbacks */ @@ -6737,8 +6735,8 @@ static int add_primitive_nurbs_surface_curve_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Surface Curve"); - ot->description= _("Construct a Nurbs surface Curve"); + ot->name= "Add Surface Curve"; + ot->description= "Construct a Nurbs surface Curve"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_curve_add"; /* api callbacks */ @@ -6760,8 +6758,8 @@ static int add_primitive_nurbs_surface_circle_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Surface Circle"); - ot->description= _("Construct a Nurbs surface Circle"); + ot->name= "Add Surface Circle"; + ot->description= "Construct a Nurbs surface Circle"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_circle_add"; /* api callbacks */ @@ -6783,8 +6781,8 @@ static int add_primitive_nurbs_surface_surface_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_surface_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Surface Patch"); - ot->description= _("Construct a Nurbs surface Patch"); + ot->name= "Add Surface Patch"; + ot->description= "Construct a Nurbs surface Patch"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_surface_add"; /* api callbacks */ @@ -6806,8 +6804,8 @@ static int add_primitive_nurbs_surface_cylinder_exec(bContext *C, wmOperator *op void SURFACE_OT_primitive_nurbs_surface_cylinder_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Surface Cylinder"); - ot->description= _("Construct a Nurbs surface Cylinder"); + ot->name= "Add Surface Cylinder"; + ot->description= "Construct a Nurbs surface Cylinder"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_cylinder_add"; /* api callbacks */ @@ -6829,8 +6827,8 @@ static int add_primitive_nurbs_surface_sphere_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_sphere_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Surface Sphere"); - ot->description= _("Construct a Nurbs surface Sphere"); + ot->name= "Add Surface Sphere"; + ot->description= "Construct a Nurbs surface Sphere"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_sphere_add"; /* api callbacks */ @@ -6852,8 +6850,8 @@ static int add_primitive_nurbs_surface_torus_exec(bContext *C, wmOperator *op) void SURFACE_OT_primitive_nurbs_surface_torus_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Surface Torus"); - ot->description= _("Construct a Nurbs surface Torus"); + ot->name= "Add Surface Torus"; + ot->description= "Construct a Nurbs surface Torus"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_torus_add"; /* api callbacks */ @@ -6907,7 +6905,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_tilt_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Tilt"); + ot->name= "Clear Tilt"; ot->idname= "CURVE_OT_tilt_clear"; /* api callbacks */ diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 0f6b3070008..6c95df53d39 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -47,8 +47,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_curve_types.h" #include "DNA_object_types.h" #include "DNA_vfont_types.h" @@ -317,8 +315,8 @@ static int insert_lorem_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_insert_lorem(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert Lorem"); - ot->description= _("Insert placeholder text"); + ot->name= "Insert Lorem"; + ot->description= "Insert placeholder text"; ot->idname= "FONT_OT_insert_lorem"; /* api callbacks */ @@ -405,8 +403,8 @@ static int paste_file_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void FONT_OT_file_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste File"); - ot->description= _("Paste contents from file"); + ot->name= "Paste File"; + ot->description= "Paste contents from file"; ot->idname= "FONT_OT_file_paste"; /* api callbacks */ @@ -454,8 +452,8 @@ static int paste_buffer_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_buffer_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Buffer"); - ot->description= _("Paste text from OS buffer"); + ot->name= "Paste Buffer"; + ot->description= "Paste text from OS buffer"; ot->idname= "FONT_OT_buffer_paste"; /* api callbacks */ @@ -612,10 +610,10 @@ static int kill_selection(Object *obedit, int ins) /* 1 == new character */ /******************* set style operator ********************/ static EnumPropertyItem style_items[]= { - {CU_CHINFO_BOLD, "BOLD", 0, N_("Bold"), ""}, - {CU_CHINFO_ITALIC, "ITALIC", 0, N_("Italic"), ""}, - {CU_CHINFO_UNDERLINE, "UNDERLINE", 0, N_("Underline"), ""}, - {CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, N_("Small Caps"), ""}, + {CU_CHINFO_BOLD, "BOLD", 0, "Bold", ""}, + {CU_CHINFO_ITALIC, "ITALIC", 0, "Italic", ""}, + {CU_CHINFO_UNDERLINE, "UNDERLINE", 0, "Underline", ""}, + {CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, "Small Caps", ""}, {0, NULL, 0, NULL, NULL}}; static int set_style(bContext *C, const int style, const int clear) @@ -652,8 +650,8 @@ static int set_style_exec(bContext *C, wmOperator *op) void FONT_OT_style_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Style"); - ot->description= _("Set font style"); + ot->name= "Set Style"; + ot->description= "Set font style"; ot->idname= "FONT_OT_style_set"; /* api callbacks */ @@ -664,8 +662,8 @@ void FONT_OT_style_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "style", RNA_enum_items_gettexted(style_items), CU_CHINFO_BOLD, _("Style"), _("Style to set selection to.")); - RNA_def_boolean(ot->srna, "clear", 0, _("Clear"), _("Clear style rather than setting it.")); + RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to."); + RNA_def_boolean(ot->srna, "clear", 0, "Clear", "Clear style rather than setting it."); } /******************* toggle style operator ********************/ @@ -690,8 +688,8 @@ static int toggle_style_exec(bContext *C, wmOperator *op) void FONT_OT_style_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Style"); - ot->description= _("Toggle font style"); + ot->name= "Toggle Style"; + ot->description= "Toggle font style"; ot->idname= "FONT_OT_style_toggle"; /* api callbacks */ @@ -702,7 +700,7 @@ void FONT_OT_style_toggle(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, _("Style"), _("Style to set selection to.")); + RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to."); } /******************* copy text operator ********************/ @@ -733,8 +731,8 @@ static int copy_text_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_text_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Text"); - ot->description= _("Copy selected text to clipboard"); + ot->name= "Copy Text"; + ot->description= "Copy selected text to clipboard"; ot->idname= "FONT_OT_text_copy"; /* api callbacks */ @@ -764,8 +762,8 @@ static int cut_text_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_text_cut(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cut Text"); - ot->description= _("Cut selected text to clipboard"); + ot->name= "Cut Text"; + ot->description= "Cut selected text to clipboard"; ot->idname= "FONT_OT_text_cut"; /* api callbacks */ @@ -822,8 +820,8 @@ static int paste_text_exec(bContext *C, wmOperator *op) void FONT_OT_text_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Text"); - ot->description= _("Paste text from clipboard"); + ot->name= "Paste Text"; + ot->description= "Paste text from clipboard"; ot->idname= "FONT_OT_text_paste"; /* api callbacks */ @@ -837,16 +835,16 @@ void FONT_OT_text_paste(wmOperatorType *ot) /************************ move operator ************************/ static EnumPropertyItem move_type_items[]= { - {LINE_BEGIN, "LINE_BEGIN", 0, N_("Line Begin"), ""}, - {LINE_END, "LINE_END", 0, N_("Line End"), ""}, - {PREV_CHAR, "PREVIOUS_CHARACTER", 0, N_("Previous Character"), ""}, - {NEXT_CHAR, "NEXT_CHARACTER", 0, N_("Next Character"), ""}, - {PREV_WORD, "PREVIOUS_WORD", 0, N_("Previous Word"), ""}, - {NEXT_WORD, "NEXT_WORD", 0, N_("Next Word"), ""}, - {PREV_LINE, "PREVIOUS_LINE", 0, N_("Previous Line"), ""}, - {NEXT_LINE, "NEXT_LINE", 0, N_("Next Line"), ""}, - {PREV_PAGE, "PREVIOUS_PAGE", 0, N_("Previous Page"), ""}, - {NEXT_PAGE, "NEXT_PAGE", 0, N_("Next Page"), ""}, + {LINE_BEGIN, "LINE_BEGIN", 0, "Line Begin", ""}, + {LINE_END, "LINE_END", 0, "Line End", ""}, + {PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, + {NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, + {PREV_WORD, "PREVIOUS_WORD", 0, "Previous Word", ""}, + {NEXT_WORD, "NEXT_WORD", 0, "Next Word", ""}, + {PREV_LINE, "PREVIOUS_LINE", 0, "Previous Line", ""}, + {NEXT_LINE, "NEXT_LINE", 0, "Next Line", ""}, + {PREV_PAGE, "PREVIOUS_PAGE", 0, "Previous Page", ""}, + {NEXT_PAGE, "NEXT_PAGE", 0, "Next Page", ""}, {0, NULL, 0, NULL, NULL}}; static int move_cursor(bContext *C, int type, int select) @@ -958,8 +956,8 @@ static int move_exec(bContext *C, wmOperator *op) void FONT_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Cursor"); - ot->description= _("Move cursor to position type"); + ot->name= "Move Cursor"; + ot->description= "Move cursor to position type"; ot->idname= "FONT_OT_move"; /* api callbacks */ @@ -970,7 +968,7 @@ void FONT_OT_move(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(move_type_items), LINE_BEGIN, _("Type"), _("Where to move cursor to.")); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to."); } /******************* move select operator ********************/ @@ -985,8 +983,8 @@ static int move_select_exec(bContext *C, wmOperator *op) void FONT_OT_move_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Select"); - ot->description= _("Make selection from current cursor position to new cursor position type"); + ot->name= "Move Select"; + ot->description= "Make selection from current cursor position to new cursor position type"; ot->idname= "FONT_OT_move_select"; /* api callbacks */ @@ -997,7 +995,7 @@ void FONT_OT_move_select(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(move_type_items), LINE_BEGIN, _("Type"), _("Where to move cursor to, to make a selection.")); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to, to make a selection."); } /************************* change spacing **********************/ @@ -1027,8 +1025,8 @@ static int change_spacing_exec(bContext *C, wmOperator *op) void FONT_OT_change_spacing(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change Spacing"); - ot->description= _("Change font spacing"); + ot->name= "Change Spacing"; + ot->description= "Change font spacing"; ot->idname= "FONT_OT_change_spacing"; /* api callbacks */ @@ -1039,7 +1037,7 @@ void FONT_OT_change_spacing(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "delta", 1, -20, 20, _("Delta"), _("Amount to decrease or increasing character spacing with."), -20, 20); + RNA_def_int(ot->srna, "delta", 1, -20, 20, "Delta", "Amount to decrease or increasing character spacing with.", -20, 20); } /************************* change character **********************/ @@ -1072,8 +1070,8 @@ static int change_character_exec(bContext *C, wmOperator *op) void FONT_OT_change_character(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Change Character"); - ot->description= _("Change font character code"); + ot->name= "Change Character"; + ot->description= "Change font character code"; ot->idname= "FONT_OT_change_character"; /* api callbacks */ @@ -1084,7 +1082,7 @@ void FONT_OT_change_character(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "delta", 1, -255, 255, _("Delta"), _("Number to increase or decrease character code with."), -255, 255); + RNA_def_int(ot->srna, "delta", 1, -255, 255, "Delta", "Number to increase or decrease character code with.", -255, 255); } /******************* line break operator ********************/ @@ -1115,8 +1113,8 @@ static int line_break_exec(bContext *C, wmOperator *op) void FONT_OT_line_break(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Line Break"); - ot->description= _("Insert line break at cursor position"); + ot->name= "Line Break"; + ot->description= "Insert line break at cursor position"; ot->idname= "FONT_OT_line_break"; /* api callbacks */ @@ -1133,12 +1131,12 @@ void FONT_OT_line_break(wmOperatorType *ot) /******************* delete operator **********************/ static EnumPropertyItem delete_type_items[]= { - {DEL_ALL, "ALL", 0, N_("All"), ""}, - {DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, N_("Next Character"), ""}, - {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", 0, N_("Previous Character"), ""}, - {DEL_SELECTION, "SELECTION", 0, N_("Selection"), ""}, - {DEL_NEXT_SEL, "NEXT_OR_SELECTION", 0, N_("Next or Selection"), ""}, - {DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", 0, N_("Previous or Selection"), ""}, + {DEL_ALL, "ALL", 0, "All", ""}, + {DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, + {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, + {DEL_SELECTION, "SELECTION", 0, "Selection", ""}, + {DEL_NEXT_SEL, "NEXT_OR_SELECTION", 0, "Next or Selection", ""}, + {DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", 0, "Previous or Selection", ""}, {0, NULL, 0, NULL, NULL}}; static int delete_exec(bContext *C, wmOperator *op) @@ -1205,8 +1203,8 @@ static int delete_exec(bContext *C, wmOperator *op) void FONT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); - ot->description= _("Delete text by cursor position"); + ot->name= "Delete"; + ot->description= "Delete text by cursor position"; ot->idname= "FONT_OT_delete"; /* api callbacks */ @@ -1217,7 +1215,7 @@ void FONT_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(delete_type_items), DEL_ALL, _("Type"), _("Which part of the text to delete.")); + RNA_def_enum(ot->srna, "type", delete_type_items, DEL_ALL, "Type", "Which part of the text to delete."); } /*********************** insert text operator *************************/ @@ -1354,8 +1352,8 @@ static int insert_text_invoke(bContext *C, wmOperator *op, wmEvent *evt) void FONT_OT_text_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert Text"); - ot->description= _("Insert text at cursor position"); + ot->name= "Insert Text"; + ot->description= "Insert text at cursor position"; ot->idname= "FONT_OT_text_insert"; /* api callbacks */ @@ -1367,8 +1365,8 @@ void FONT_OT_text_insert(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); - RNA_def_boolean(ot->srna, "accent", 0, _("Accent mode"), _("Next typed character will strike through previous, for special character input.")); + RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); + RNA_def_boolean(ot->srna, "accent", 0, "Accent mode", "Next typed character will strike through previous, for special character input."); } @@ -1393,8 +1391,8 @@ static int textbox_add_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_textbox_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Textbox"); - ot->description= _("Add a new text box"); + ot->name= "Add Textbox"; + ot->description= "Add a new text box"; ot->idname= "FONT_OT_textbox_add"; /* api callbacks */ @@ -1436,8 +1434,8 @@ static int textbox_remove_exec(bContext *C, wmOperator *op) void FONT_OT_textbox_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Textbox"); - ot->description= _("Remove the textbox"); + ot->name= "Remove Textbox"; + ot->description= "Remove the textbox"; ot->idname= "FONT_OT_textbox_remove"; /* api callbacks */ @@ -1447,7 +1445,7 @@ void FONT_OT_textbox_remove(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), _("The current text box."), 0, INT_MAX); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "The current text box.", 0, INT_MAX); } @@ -1527,8 +1525,8 @@ void free_editText(Object *obedit) /********************** set case operator *********************/ static EnumPropertyItem case_items[]= { - {CASE_LOWER, "LOWER", 0, N_("Lower"), ""}, - {CASE_UPPER, "UPPER", 0, N_("Upper"), ""}, + {CASE_LOWER, "LOWER", 0, "Lower", ""}, + {CASE_UPPER, "UPPER", 0, "Upper", ""}, {0, NULL, 0, NULL, NULL}}; static int set_case(bContext *C, int ccase) @@ -1574,8 +1572,8 @@ static int set_case_exec(bContext *C, wmOperator *op) void FONT_OT_case_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Case"); - ot->description= _("Set font case"); + ot->name= "Set Case"; + ot->description= "Set font case"; ot->idname= "FONT_OT_case_set"; /* api callbacks */ @@ -1586,7 +1584,7 @@ void FONT_OT_case_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "case", RNA_enum_items_gettexted(case_items), CASE_LOWER, _("Case"), _("Lower or upper case.")); + RNA_def_enum(ot->srna, "case", case_items, CASE_LOWER, "Case", "Lower or upper case."); } /********************** toggle case operator *********************/ @@ -1617,8 +1615,8 @@ static int toggle_case_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_case_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Case"); - ot->description= _("Toggle font case"); + ot->name= "Toggle Case"; + ot->description= "Toggle font case"; ot->idname= "FONT_OT_case_toggle"; /* api callbacks */ @@ -1717,7 +1715,7 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void FONT_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Open Font"); + ot->name= "Open Font"; ot->idname= "FONT_OT_open"; /* api callbacks */ @@ -1760,9 +1758,9 @@ static int font_unlink_exec(bContext *C, wmOperator *op) void FONT_OT_unlink(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Unlink"); + ot->name= "Unlink"; ot->idname= "FONT_OT_unlink"; - ot->description= _("Unlink active font data block"); + ot->description= "Unlink active font data block"; /* api callbacks */ ot->exec= font_unlink_exec; diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 52e50b1b5b0..a23f2064a9e 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -40,8 +40,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_gpencil.h" #include "BKE_context.h" #include "BKE_global.h" @@ -1878,19 +1876,19 @@ static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event) /* ------------------------------- */ static EnumPropertyItem prop_gpencil_drawmodes[] = { - {GP_PAINTMODE_DRAW, "DRAW", 0, N_("Draw Freehand"), ""}, - {GP_PAINTMODE_DRAW_STRAIGHT, "DRAW_STRAIGHT", 0, N_("Draw Straight Lines"), ""}, - {GP_PAINTMODE_DRAW_POLY, "DRAW_POLY", 0, N_("Dtaw Poly Line"), ""}, - {GP_PAINTMODE_ERASER, "ERASER", 0, N_("Eraser"), ""}, + {GP_PAINTMODE_DRAW, "DRAW", 0, "Draw Freehand", ""}, + {GP_PAINTMODE_DRAW_STRAIGHT, "DRAW_STRAIGHT", 0, "Draw Straight Lines", ""}, + {GP_PAINTMODE_DRAW_POLY, "DRAW_POLY", 0, "Dtaw Poly Line", ""}, + {GP_PAINTMODE_ERASER, "ERASER", 0, "Eraser", ""}, {0, NULL, 0, NULL, NULL} }; void GPENCIL_OT_draw (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Grease Pencil Draw"); + ot->name= "Grease Pencil Draw"; ot->idname= "GPENCIL_OT_draw"; - ot->description= _("Make annotations on the active data"); + ot->description= "Make annotations on the active data"; /* api callbacks */ ot->exec= gpencil_draw_exec; @@ -1903,7 +1901,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* settings for drawing */ - RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_gpencil_drawmodes), 0, _("Mode"), _("Way to intepret mouse movements.")); + RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to intepret mouse movements."); RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index c95862c6fdb..0e36e056187 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -90,23 +90,6 @@ static void ui_free_but(const bContext *C, uiBut *but); -/* ************* translation ************** */ - -int ui_translate_buttons(void) -{ - return (U.transopts & USER_TR_BUTTONS); -} - -int ui_translate_menus(void) -{ - return (U.transopts & USER_TR_MENUS); -} - -int ui_translate_tooltips(void) -{ - return (U.transopts & USER_TR_TOOLTIPS); -} - /* ************* window matrix ************** */ void ui_block_to_window_fl(const ARegion *ar, uiBlock *block, float *x, float *y) @@ -237,9 +220,6 @@ static void ui_text_bounds_block(uiBlock *block, float offset) for(bt= block->buttons.first; bt; bt= bt->next) { if(bt->type!=SEPR) { - //int transopts= ui_translate_buttons(); - //if(bt->type==TEX || bt->type==IDPOIN) transopts= 0; - j= BLF_width(style->widget.uifont_id, bt->drawstr); if(j > i) i = j; @@ -2030,12 +2010,9 @@ void ui_check_but(uiBut *but) /* if something changed in the button */ double value= UI_BUT_VALUE_UNSET; // float okwidth; // UNUSED -// int transopts= ui_translate_buttons(); ui_is_but_sel(but, &value); -// if(but->type==TEX || but->type==IDPOIN) transopts= 0; - /* only update soft range while not editing */ if(but->rnaprop && !(but->editval || but->editstr || but->editvec)) { UI_GET_BUT_VALUE_INIT(but, value) @@ -2544,7 +2521,7 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s DynStr *dynstr; int i, totitem, value, free; - RNA_property_enum_items(block->evil_C, ptr, prop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); value= RNA_property_enum_get(ptr, prop); dynstr= BLI_dynstr_new(); @@ -2579,7 +2556,7 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s EnumPropertyItem *item; int i, totitem, free; - RNA_property_enum_items(block->evil_C, ptr, prop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); for(i=0; idescription) { tip= ot->description; + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts|USER_TR_TOOLTIPS)) + tip= BLF_gettext(tip); +#endif } but= ui_def_but(block, type, -1, str, x1, y1, x2, y2, NULL, 0, 0, 0, 0, tip); diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index ebc8725ad5d..72eb869dea0 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -347,10 +347,6 @@ typedef struct uiSafetyRct { extern void ui_delete_linkline(uiLinkLine *line, uiBut *but); -extern int ui_translate_buttons(void); -extern int ui_translate_menus(void); -extern int ui_translate_tooltips(void); - void ui_fontscale(short *points, float aspect); extern void ui_block_to_window_fl(const struct ARegion *ar, uiBlock *block, float *x, float *y); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 5f15cf7e5f7..161bb11dcef 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -477,7 +477,7 @@ static void ui_item_enum_expand(uiLayout *layout, uiBlock *block, PointerRNA *pt const char *name; int a, totitem, itemw, icon, value, free; - RNA_property_enum_items(block->evil_C, ptr, prop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); uiBlockSetCurLayout(block, ui_item_local_sublayout(layout, layout, 1)); for(a=0; aname; + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) + name= BLF_gettext(name); +#endif + } + if(layout->root->type == UI_LAYOUT_MENU && !icon) icon= ICON_BLANK1; @@ -703,7 +710,7 @@ static const char *ui_menu_enumpropname(uiLayout *layout, const char *opname, co int totitem, free; const char *name; - RNA_property_enum_items(layout->root->block->evil_C, &ptr, prop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(layout->root->block->evil_C, &ptr, prop, &item, &totitem, &free); if(RNA_enum_name(item, retval, &name)) { if(free) MEM_freeN(item); return name; @@ -755,7 +762,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname uiLayout *split= uiLayoutSplit(layout, 0, 0); uiLayout *column= uiLayoutColumn(split, 0); - RNA_property_enum_items(block->evil_C, &ptr, prop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(block->evil_C, &ptr, prop, &item, &totitem, &free); for(i=0; iroot->block->evil_C, &ptr, prop, &item, NULL, &free); + RNA_property_enum_items_gettexted(layout->root->block->evil_C, &ptr, prop, &item, NULL, &free); if(item==NULL || RNA_enum_value_from_id(item, value_str, &value)==0) { if(free) MEM_freeN(item); RNA_warning("%s.%s, enum %s not found.", RNA_struct_identifier(ptr.type), propname, value_str); @@ -1093,7 +1100,7 @@ void uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr, const char *pr return; } - RNA_property_enum_items(layout->root->block->evil_C, ptr, prop, &item, NULL, &free); + RNA_property_enum_items_gettexted(layout->root->block->evil_C, ptr, prop, &item, NULL, &free); if(!RNA_enum_value_from_id(item, value, &ivalue)) { if(free) MEM_freeN(item); @@ -1137,7 +1144,7 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname uiLayout *split= uiLayoutSplit(layout, 0, 0); uiLayout *column= uiLayoutColumn(split, 0); - RNA_property_enum_items(block->evil_C, ptr, prop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); for(i=0; ilabel; + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) + name= BLF_gettext(name); +#endif + } + if(layout->root->type == UI_LAYOUT_MENU && !icon) icon= ICON_BLANK1; diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 6a35ba9baf1..e9fad382beb 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -44,8 +44,6 @@ #include "BLI_math_color.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_global.h" #include "BKE_text.h" /* for UI_OT_reports_to_text */ @@ -217,9 +215,9 @@ static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op)) static void UI_OT_reset_default_theme(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset to Default Theme"); + ot->name= "Reset to Default Theme"; ot->idname= "UI_OT_reset_default_theme"; - ot->description= _("Reset to the default theme colors"); + ot->description= "Reset to the default theme colors"; /* callbacks */ ot->exec= reset_default_theme_exec; @@ -307,9 +305,9 @@ static int reset_default_button_exec(bContext *C, wmOperator *op) static void UI_OT_reset_default_button(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset to Default Value"); + ot->name= "Reset to Default Value"; ot->idname= "UI_OT_reset_default_button"; - ot->description= _("Reset this property's value to its default value"); + ot->description= "Reset this property's value to its default value"; /* callbacks */ ot->poll= reset_default_button_poll; @@ -319,7 +317,7 @@ static void UI_OT_reset_default_button(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Reset to default values all elements of the array.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array."); } /* Copy To Selected Operator ------------------------ */ @@ -399,9 +397,9 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op) static void UI_OT_copy_to_selected_button(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy To Selected"); + ot->name= "Copy To Selected"; ot->idname= "UI_OT_copy_to_selected_button"; - ot->description= _("Copy property from this object to selected objects or bones"); + ot->description= "Copy property from this object to selected objects or bones"; /* callbacks */ ot->poll= copy_to_selected_button_poll; @@ -411,7 +409,7 @@ static void UI_OT_copy_to_selected_button(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 1, _("All"), _("Reset to default values all elements of the array.")); + RNA_def_boolean(ot->srna, "all", 1, "All", "Reset to default values all elements of the array."); } /* Reports to Textblock Operator ------------------------ */ diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index d4f49d750ac..8fc4904eed4 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -53,6 +53,8 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "BLF_api.h" + #include "WM_api.h" #include "WM_types.h" @@ -442,8 +444,13 @@ static void ui_draw_aligned_panel_header(uiStyle *style, uiBlock *block, rcti *r Panel *panel= block->panel; rcti hrect; int pnl_icons; - char *activename= panel->drawname[0]?panel->drawname:panel->panelname; - + const char *activename= panel->drawname[0]?panel->drawname:panel->panelname; + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) + activename= BLF_gettext(activename); +#endif + /* + 0.001f to avoid flirting with float inaccuracy */ if(panel->control & UI_PNL_CLOSE) pnl_icons=(panel->labelofs+2*PNL_ICON+5)/block->aspect + 0.001f; else pnl_icons= (panel->labelofs+PNL_ICON+5)/block->aspect + 0.001f; diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index f4aaf6212a8..e673add46b1 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -374,7 +374,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) EnumPropertyItem *item; int i, totitem, free; - RNA_property_enum_items(C, &but->rnapoin, but->rnaprop, &item, &totitem, &free); + RNA_property_enum_items_gettexted(C, &but->rnapoin, but->rnaprop, &item, &totitem, &free); for(i=0; ihardmax) { diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 45829646145..d9a5e92a72c 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1018,7 +1018,6 @@ static void ui_text_label_rightclip(uiFontStyle *fstyle, uiBut *but, rcti *rect) static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, rcti *rect) { -// int transopts; char *cpoin = NULL; /* for underline drawing */ @@ -1088,10 +1087,6 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b if (fstyle->kerning == 1) BLF_disable(fstyle->uifont_id, BLF_KERNING_DEFAULT); - // ui_rasterpos_safe(x, y, but->aspect); -// if(but->type==IDPOIN) transopts= 0; // no translation, of course! -// else transopts= ui_translate_buttons(); - /* cut string in 2 parts - only for menu entries */ if((but->block->flag & UI_BLOCK_LOOP)) { if(ELEM5(but->type, SLI, NUM, TEX, NUMSLI, NUMABS)==0) { diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 8cdb67a13fd..3ecc8cce8b1 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -39,8 +39,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "RNA_access.h" @@ -295,8 +293,8 @@ static int view_pan_cancel(bContext *UNUSED(C), wmOperator *op) static void VIEW2D_OT_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Pan View"); - ot->description= _("Pan the view"); + ot->name= "Pan View"; + ot->description= "Pan the view"; ot->idname= "VIEW2D_OT_pan"; /* api callbacks */ @@ -309,8 +307,8 @@ static void VIEW2D_OT_pan(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* rna - must keep these in sync with the other operators */ - RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, _("Delta X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, _("Delta Y"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX); } /* ------------------ Scrollwheel Versions (2) ---------------------- */ @@ -345,16 +343,16 @@ static int view_scrollright_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_right(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scroll Right"); - ot->description= _("Scroll the view right"); + ot->name= "Scroll Right"; + ot->description= "Scroll the view right"; ot->idname= "VIEW2D_OT_scroll_right"; /* api callbacks */ ot->exec= view_scrollright_exec; /* rna - must keep these in sync with the other operators */ - RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, _("Delta X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, _("Delta Y"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX); } @@ -389,16 +387,16 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_left(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scroll Left"); - ot->description= _("Scroll the view left"); + ot->name= "Scroll Left"; + ot->description= "Scroll the view left"; ot->idname= "VIEW2D_OT_scroll_left"; /* api callbacks */ ot->exec= view_scrollleft_exec; /* rna - must keep these in sync with the other operators */ - RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, _("Delta X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, _("Delta Y"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX); } @@ -437,17 +435,17 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_down(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scroll Down"); - ot->description= _("Scroll the view down"); + ot->name= "Scroll Down"; + ot->description= "Scroll the view down"; ot->idname= "VIEW2D_OT_scroll_down"; /* api callbacks */ ot->exec= view_scrolldown_exec; /* rna - must keep these in sync with the other operators */ - RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, _("Delta X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, _("Delta Y"), "", INT_MIN, INT_MAX); - RNA_def_boolean(ot->srna, "page", 0, _("Page"), _("Scroll down one page.")); + RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX); + RNA_def_boolean(ot->srna, "page", 0, "Page", "Scroll down one page."); } @@ -487,17 +485,17 @@ static int view_scrollup_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_up(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scroll Up"); - ot->description= _("Scroll the view up"); + ot->name= "Scroll Up"; + ot->description= "Scroll the view up"; ot->idname= "VIEW2D_OT_scroll_up"; /* api callbacks */ ot->exec= view_scrollup_exec; /* rna - must keep these in sync with the other operators */ - RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, _("Delta X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, _("Delta Y"), "", INT_MIN, INT_MAX); - RNA_def_boolean(ot->srna, "page", 0, _("Page"), _("Scroll up one page.")); + RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX); + RNA_def_boolean(ot->srna, "page", 0, "Page", "Scroll up one page."); } /* ********************************************************* */ @@ -715,8 +713,8 @@ static int view_zoomin_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Zoom In"); - ot->description= _("Zoom in the view"); + ot->name= "Zoom In"; + ot->description= "Zoom in the view"; ot->idname= "VIEW2D_OT_zoom_in"; /* api callbacks */ @@ -725,8 +723,8 @@ static void VIEW2D_OT_zoom_in(wmOperatorType *ot) ot->poll= view_zoom_poll; /* rna - must keep these in sync with the other operators */ - RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor X"), "", -FLT_MAX, FLT_MAX); - RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor Y"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX); } /* this operator only needs this single callback, where it callsthe view_zoom_*() methods */ @@ -772,8 +770,8 @@ static int view_zoomout_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Zoom Out"); - ot->description= _("Zoom out the view"); + ot->name= "Zoom Out"; + ot->description= "Zoom out the view"; ot->idname= "VIEW2D_OT_zoom_out"; /* api callbacks */ @@ -782,8 +780,8 @@ static void VIEW2D_OT_zoom_out(wmOperatorType *ot) ot->poll= view_zoom_poll; /* rna - must keep these in sync with the other operators */ - RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor X"), "", -FLT_MAX, FLT_MAX); - RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor Y"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX); } /* ********************************************************* */ @@ -1067,8 +1065,8 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Zoom 2D View"); - ot->description= _("Zoom in/out the view"); + ot->name= "Zoom 2D View"; + ot->description= "Zoom in/out the view"; ot->idname= "VIEW2D_OT_zoom"; /* api callbacks */ @@ -1083,8 +1081,8 @@ static void VIEW2D_OT_zoom(wmOperatorType *ot) // ot->flag= OPTYPE_BLOCKING; /* rna - must keep these in sync with the other operators */ - RNA_def_float(ot->srna, "deltax", 0, -FLT_MAX, FLT_MAX, _("Delta X"), "", -FLT_MAX, FLT_MAX); - RNA_def_float(ot->srna, "deltay", 0, -FLT_MAX, FLT_MAX, _("Delta Y"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "deltax", 0, -FLT_MAX, FLT_MAX, "Delta X", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "deltay", 0, -FLT_MAX, FLT_MAX, "Delta Y", "", -FLT_MAX, FLT_MAX); } /* ********************************************************* */ @@ -1168,8 +1166,8 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Zoom to Border"); - ot->description= _("Zoom in the view to the nearest item contained in the border"); + ot->name= "Zoom to Border"; + ot->description= "Zoom in the view to the nearest item contained in the border"; ot->idname= "VIEW2D_OT_zoom_border"; /* api callbacks */ @@ -1181,11 +1179,11 @@ static void VIEW2D_OT_zoom_border(wmOperatorType *ot) ot->poll= view_zoom_poll; /* rna */ - RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, _("Gesture Mode"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, _("X Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, _("X Max"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, _("Y Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, _("Y Max"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); } /* ********************************************************* */ @@ -1570,8 +1568,8 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_scroller_activate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scroller Activate"); - ot->description= _("Scroll view by mouse click and drag"); + ot->name= "Scroller Activate"; + ot->description= "Scroll view by mouse click and drag"; ot->idname= "VIEW2D_OT_scroller_activate"; /* flags */ @@ -1638,8 +1636,8 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op)) static void VIEW2D_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset View"); - ot->description= _("Reset the view"); + ot->name= "Reset View"; + ot->description= "Reset the view"; ot->idname= "VIEW2D_OT_reset"; /* api callbacks */ diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 3c78983f82d..02a25a2a122 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index 1c2b9d5d1d6..b992ae5f04c 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu ../../blenloader' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index d6e451a8625..9bf863faae3 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -50,8 +50,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_DerivedMesh.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -1314,9 +1312,9 @@ void remake_editMesh(Scene *scene, Object *ob) /* *************** Operator: separate parts *************/ static EnumPropertyItem prop_separate_types[] = { - {0, "SELECTED", 0, N_("Selection"), ""}, - {1, "MATERIAL", 0, N_("By Material"), ""}, - {2, "LOOSE", 0, N_("By loose parts"), ""}, + {0, "SELECTED", 0, "Selection", ""}, + {1, "MATERIAL", 0, "By Material", ""}, + {2, "LOOSE", 0, "By loose parts", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1542,8 +1540,8 @@ static int mesh_separate_exec(bContext *C, wmOperator *op) void MESH_OT_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Separate"); - ot->description= _("Separate selected geometry into a new mesh"); + ot->name= "Separate"; + ot->description= "Separate selected geometry into a new mesh"; ot->idname= "MESH_OT_separate"; /* api callbacks */ @@ -1554,7 +1552,7 @@ void MESH_OT_separate(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_separate_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_separate_types, 0, "Type", ""); } diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index f29c0857dc1..0c819cd7649 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -52,8 +52,6 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_library.h" @@ -274,8 +272,8 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate or Extrude at 3D Cursor"); - ot->description= _("Duplicate and extrude selected vertices, edges or faces towards 3D Cursor"); + ot->name= "Duplicate or Extrude at 3D Cursor"; + ot->description= "Duplicate and extrude selected vertices, edges or faces towards 3D Cursor"; ot->idname= "MESH_OT_dupli_extrude_cursor"; /* api callbacks */ @@ -285,7 +283,7 @@ void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "rotate_source", 1, _("Rotate Source"), _("Rotate initial selection giving better shape")); + RNA_def_boolean(ot->srna, "rotate_source", 1, "Rotate Source", "Rotate initial selection giving better shape"); } @@ -407,8 +405,8 @@ static int make_fgon_exec(bContext *C, wmOperator *op) void MESH_OT_fgon_make(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make F-gon"); - ot->description= _("Make fgon from selected faces"); + ot->name= "Make F-gon"; + ot->description= "Make fgon from selected faces"; ot->idname= "MESH_OT_fgon_make"; /* api callbacks */ @@ -439,8 +437,8 @@ static int clear_fgon_exec(bContext *C, wmOperator *op) void MESH_OT_fgon_clear(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear F-gon"); - ot->description= _("Clear fgon from selected face"); + ot->name= "Clear F-gon"; + ot->description= "Clear fgon from selected face"; ot->idname= "MESH_OT_fgon_clear"; /* api callbacks */ @@ -851,8 +849,8 @@ static int addedgeface_mesh_exec(bContext *C, wmOperator *op) void MESH_OT_edge_face_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Edge/Face"); - ot->description= _("Add an edge or face to selected"); + ot->name= "Make Edge/Face"; + ot->description= "Add an edge or face to selected"; ot->idname= "MESH_OT_edge_face_add"; /* api callbacks */ @@ -1407,8 +1405,8 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_plane_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Plane"); - ot->description= _("Construct a filled planar mesh with 4 vertices"); + ot->name= "Add Plane"; + ot->description= "Construct a filled planar mesh with 4 vertices"; ot->idname= "MESH_OT_primitive_plane_add"; /* api callbacks */ @@ -1440,8 +1438,8 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cube_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Cube"); - ot->description= _("Construct a cube mesh"); + ot->name= "Add Cube"; + ot->description= "Construct a cube mesh"; ot->idname= "MESH_OT_primitive_cube_add"; /* api callbacks */ @@ -1475,8 +1473,8 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Circle"); - ot->description= _("Construct a circle mesh"); + ot->name= "Add Circle"; + ot->description= "Construct a circle mesh"; ot->idname= "MESH_OT_primitive_circle_add"; /* api callbacks */ @@ -1488,8 +1486,8 @@ void MESH_OT_primitive_circle_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, _("Vertices"), "", 3, 500); - RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, _("Radius"), "", 0.001, 100.00); + RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00); RNA_def_boolean(ot->srna, "fill", 0, "Fill", ""); ED_object_add_generic_props(ot, TRUE); @@ -1516,8 +1514,8 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cylinder_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Cylinder"); - ot->description= _("Construct a cylinder mesh"); + ot->name= "Add Cylinder"; + ot->description= "Construct a cylinder mesh"; ot->idname= "MESH_OT_primitive_cylinder_add"; /* api callbacks */ @@ -1529,10 +1527,10 @@ void MESH_OT_primitive_cylinder_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, _("Vertices"), "", 2, 500); - RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, _("Radius"), "", 0.001, 100.00); - RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, _("Depth"), "", 0.001, 100.00); - RNA_def_boolean(ot->srna, "cap_ends", 1, _("Cap Ends"), ""); + RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00); + RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00); + RNA_def_boolean(ot->srna, "cap_ends", 1, "Cap Ends", ""); ED_object_add_generic_props(ot, TRUE); } @@ -1557,8 +1555,8 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cone_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Cone"); - ot->description= _("Construct a conic mesh (ends filled)"); + ot->name= "Add Cone"; + ot->description= "Construct a conic mesh (ends filled)"; ot->idname= "MESH_OT_primitive_cone_add"; /* api callbacks */ @@ -1570,10 +1568,10 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, _("Vertices"), "", 2, 500); - RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, _("Radius"), "", 0.001, 100.00); - RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, _("Depth"), "", 0.001, 100.00); - RNA_def_boolean(ot->srna, "cap_end", 1, _("Cap End"), ""); + RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00); + RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00); + RNA_def_boolean(ot->srna, "cap_end", 1, "Cap End", ""); ED_object_add_generic_props(ot, TRUE); } @@ -1598,8 +1596,8 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_grid_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Grid"); - ot->description= _("Construct a grid mesh"); + ot->name= "Add Grid"; + ot->description= "Construct a grid mesh"; ot->idname= "MESH_OT_primitive_grid_add"; /* api callbacks */ @@ -1611,9 +1609,9 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "x_subdivisions", 10, 3, INT_MAX, _("X Subdivisions"), "", 3, 1000); - RNA_def_int(ot->srna, "y_subdivisions", 10, 3, INT_MAX, _("Y Subdivisions"), "", 3, 1000); - RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, _("Size"), "", 0.001, FLT_MAX); + RNA_def_int(ot->srna, "x_subdivisions", 10, 3, INT_MAX, "X Subdivisions", "", 3, 1000); + RNA_def_int(ot->srna, "y_subdivisions", 10, 3, INT_MAX, "Y Subdivisions", "", 3, 1000); + RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX); ED_object_add_generic_props(ot, TRUE); } @@ -1636,8 +1634,8 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_monkey_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Monkey"); - ot->description= _("Construct a Suzanne mesh"); + ot->name= "Add Monkey"; + ot->description= "Construct a Suzanne mesh"; ot->idname= "MESH_OT_primitive_monkey_add"; /* api callbacks */ @@ -1671,8 +1669,8 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add UV Sphere"); - ot->description= _("Construct a UV sphere mesh"); + ot->name= "Add UV Sphere"; + ot->description= "Construct a UV sphere mesh"; ot->idname= "MESH_OT_primitive_uv_sphere_add"; /* api callbacks */ @@ -1684,9 +1682,9 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, _("Segments"), "", 3, 500); - RNA_def_int(ot->srna, "ring_count", 16, 3, INT_MAX, _("Rings"), "", 3, 500); - RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, _("Size"), "", 0.001, 100.00); + RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, "Segments", "", 3, 500); + RNA_def_int(ot->srna, "ring_count", 16, 3, INT_MAX, "Rings", "", 3, 500); + RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00); ED_object_add_generic_props(ot, TRUE); } @@ -1710,8 +1708,8 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Ico Sphere"); - ot->description= _("Construct an Icosphere mesh"); + ot->name= "Add Ico Sphere"; + ot->description= "Construct an Icosphere mesh"; ot->idname= "MESH_OT_primitive_ico_sphere_add"; /* api callbacks */ @@ -1723,8 +1721,8 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, _("Subdivisions"), "", 1, 8); - RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, _("Size"), "", 0.001f, 100.00); + RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, "Subdivisions", "", 1, 8); + RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00); ED_object_add_generic_props(ot, TRUE); } @@ -1758,8 +1756,8 @@ static int mesh_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev void MESH_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Mesh"); - ot->description= _("Duplicate selected vertices, edges or faces"); + ot->name= "Duplicate Mesh"; + ot->description= "Duplicate selected vertices, edges or faces"; ot->idname= "MESH_OT_duplicate"; /* api callbacks */ @@ -1769,6 +1767,6 @@ void MESH_OT_duplicate(wmOperatorType *ot) ot->poll= ED_operator_editmesh; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index fbc531d0e92..acbe5ef2144 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -55,8 +55,6 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv #include "BLI_editVert.h" #include "BLI_ghash.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_mesh.h" @@ -449,9 +447,9 @@ typedef struct CutCurve { #define KNIFE_MULTICUT 3 static EnumPropertyItem knife_items[]= { - {KNIFE_EXACT, "EXACT", 0, N_("Exact"), ""}, - {KNIFE_MIDPOINT, "MIDPOINTS", 0, N_("Midpoints"), ""}, - {KNIFE_MULTICUT, "MULTICUT", 0, N_("Multicut"), ""}, + {KNIFE_EXACT, "EXACT", 0, "Exact", ""}, + {KNIFE_MIDPOINT, "MIDPOINTS", 0, "Midpoints", ""}, + {KNIFE_MULTICUT, "MULTICUT", 0, "Multicut", ""}, {0, NULL, 0, NULL, NULL} }; @@ -714,8 +712,8 @@ void MESH_OT_knife_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= _("Knife Cut"); - ot->description= _("Cut selected edges and faces into parts"); + ot->name= "Knife Cut"; + ot->description= "Cut selected edges and faces into parts"; ot->idname= "MESH_OT_knife_cut"; ot->invoke= WM_gesture_lines_invoke; @@ -728,14 +726,14 @@ void MESH_OT_knife_cut(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(knife_items), KNIFE_EXACT, _("Type"), ""); + RNA_def_enum(ot->srna, "type", knife_items, KNIFE_EXACT, "Type", ""); prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); - RNA_def_int(ot->srna, "num_cuts", 1, 1, MAX_CUTS, _("Number of Cuts"), _("Only for Multi-Cut"), 1, MAX_CUTS); + RNA_def_int(ot->srna, "num_cuts", 1, 1, MAX_CUTS, "Number of Cuts", "Only for Multi-Cut", 1, MAX_CUTS); // doesn't work atm.. RNA_def_enum(ot->srna, "corner_cut_pattern", corner_type_items, SUBDIV_CORNER_INNERVERT, "Corner Cut Pattern", "Topology pattern to use to fill a face after cutting across its corner"); /* internal */ - RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, _("Cursor"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX); } /* ******************************************************* */ diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 945907073cf..7af4ebee3bc 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -55,8 +55,6 @@ editmesh_mods.c, UI level access, no geometry changes #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_displist.h" #include "BKE_depsgraph.h" @@ -714,22 +712,22 @@ static int unified_findnearest(ViewContext *vc, EditVert **eve, EditEdge **eed, #define SIMFACE_TOT 207 static EnumPropertyItem prop_similar_types[] = { - {SIMVERT_NORMAL, "NORMAL", 0, N_("Normal"), ""}, - {SIMVERT_FACE, "FACE", 0, N_("Amount of Vertices in Face"), ""}, - {SIMVERT_VGROUP, "VGROUP", 0, N_("Vertex Groups"), ""}, - {SIMEDGE_LENGTH, "LENGTH", 0, N_("Length"), ""}, - {SIMEDGE_DIR, "DIR", 0, N_("Direction"), ""}, - {SIMEDGE_FACE, "FACE", 0, N_("Amount of Vertices in Face"), ""}, - {SIMEDGE_FACE_ANGLE, "FACE_ANGLE", 0, N_("Face Angles"), ""}, - {SIMEDGE_CREASE, "CREASE", 0, N_("Crease"), ""}, - {SIMEDGE_SEAM, "SEAM", 0, N_("Seam"), ""}, - {SIMEDGE_SHARP, "SHARP", 0, N_("Sharpness"), ""}, - {SIMFACE_MATERIAL, "MATERIAL", 0, N_("Material"), ""}, - {SIMFACE_IMAGE, "IMAGE", 0, N_("Image"), ""}, - {SIMFACE_AREA, "AREA", 0, N_("Area"), ""}, - {SIMFACE_PERIMETER, "PERIMETER", 0, N_("Perimeter"), ""}, - {SIMFACE_NORMAL, "NORMAL", 0, N_("Normal"), ""}, - {SIMFACE_COPLANAR, "COPLANAR", 0, N_("Co-planar"), ""}, + {SIMVERT_NORMAL, "NORMAL", 0, "Normal", ""}, + {SIMVERT_FACE, "FACE", 0, "Amount of Vertices in Face", ""}, + {SIMVERT_VGROUP, "VGROUP", 0, "Vertex Groups", ""}, + {SIMEDGE_LENGTH, "LENGTH", 0, "Length", ""}, + {SIMEDGE_DIR, "DIR", 0, "Direction", ""}, + {SIMEDGE_FACE, "FACE", 0, "Amount of Vertices in Face", ""}, + {SIMEDGE_FACE_ANGLE, "FACE_ANGLE", 0, "Face Angles", ""}, + {SIMEDGE_CREASE, "CREASE", 0, "Crease", ""}, + {SIMEDGE_SEAM, "SEAM", 0, "Seam", ""}, + {SIMEDGE_SHARP, "SHARP", 0, "Sharpness", ""}, + {SIMFACE_MATERIAL, "MATERIAL", 0, "Material", ""}, + {SIMFACE_IMAGE, "IMAGE", 0, "Image", ""}, + {SIMFACE_AREA, "AREA", 0, "Area", ""}, + {SIMFACE_PERIMETER, "PERIMETER", 0, "Perimeter", ""}, + {SIMFACE_NORMAL, "NORMAL", 0, "Normal", ""}, + {SIMFACE_COPLANAR, "COPLANAR", 0, "Co-planar", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1290,8 +1288,8 @@ void MESH_OT_select_similar(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Select Similar"); - ot->description= _("Select similar vertices, edges or faces by property types"); + ot->name= "Select Similar"; + ot->description= "Select similar vertices, edges or faces by property types"; ot->idname= "MESH_OT_select_similar"; /* api callbacks */ @@ -1303,10 +1301,10 @@ void MESH_OT_select_similar(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_similar_types), SIMVERT_NORMAL, _("Type"), ""); + prop= RNA_def_enum(ot->srna, "type", prop_similar_types, SIMVERT_NORMAL, "Type", ""); RNA_def_enum_funcs(prop, select_similar_type_itemf); ot->prop= prop; - RNA_def_float(ot->srna, "threshold", 0.01f, 0.0f, FLT_MAX, _("Threshold"), "", 0.0f, 100.f); + RNA_def_float(ot->srna, "threshold", 0.01f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 100.f); } /* ******************************************* */ @@ -2042,8 +2040,8 @@ static int loop_multiselect(bContext *C, wmOperator *op) void MESH_OT_loop_multi_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Multi Select Loops"); - ot->description= _("Select a loop of connected edges by connection type"); + ot->name= "Multi Select Loops"; + ot->description= "Select a loop of connected edges by connection type"; ot->idname= "MESH_OT_loop_multi_select"; /* api callbacks */ @@ -2054,7 +2052,7 @@ void MESH_OT_loop_multi_select(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "ring", 0, _("Ring"), ""); + RNA_def_boolean(ot->srna, "ring", 0, "Ring", ""); } @@ -2132,8 +2130,8 @@ static int mesh_select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_loop_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Loop Select"); - ot->description= _("Select a loop of connected edges"); + ot->name= "Loop Select"; + ot->description= "Select a loop of connected edges"; ot->idname= "MESH_OT_loop_select"; /* api callbacks */ @@ -2144,8 +2142,8 @@ void MESH_OT_loop_select(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); - RNA_def_boolean(ot->srna, "ring", 0, _("Select Ring"), ""); + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); + RNA_def_boolean(ot->srna, "ring", 0, "Select Ring", ""); } /* ******************* mesh shortest path select, uses prev-selected edge ****************** */ @@ -2263,8 +2261,8 @@ static int mesh_shortest_path_select_poll(bContext *C) void MESH_OT_select_shortest_path(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shortest Path Select"); - ot->description= _("Select shortest path between two selections"); + ot->name= "Shortest Path Select"; + ot->description= "Select shortest path between two selections"; ot->idname= "MESH_OT_select_shortest_path"; /* api callbacks */ @@ -2275,7 +2273,7 @@ void MESH_OT_select_shortest_path(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } @@ -2571,8 +2569,8 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event void MESH_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked"); - ot->description= _("(un)select all vertices linked to the active mesh"); + ot->name= "Select Linked"; + ot->description= "(un)select all vertices linked to the active mesh"; ot->idname= "MESH_OT_select_linked_pick"; /* api callbacks */ @@ -2582,8 +2580,8 @@ void MESH_OT_select_linked_pick(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "deselect", 0, _("Deselect"), ""); - RNA_def_boolean(ot->srna, "limit", 0, _("Limit by Seams"), _("Limit selection by seam boundaries (faces only)")); + RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", ""); + RNA_def_boolean(ot->srna, "limit", 0, "Limit by Seams", "Limit selection by seam boundaries (faces only)"); } @@ -2660,8 +2658,8 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void MESH_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked All"); - ot->description= _("Select all vertices linked to the active mesh"); + ot->name= "Select Linked All"; + ot->description= "Select all vertices linked to the active mesh"; ot->idname= "MESH_OT_select_linked"; /* api callbacks */ @@ -2672,7 +2670,7 @@ void MESH_OT_select_linked(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "limit", 0, _("Limit by Seams"), _("Limit selection by seam boundaries (faces only)")); + RNA_def_boolean(ot->srna, "limit", 0, "Limit by Seams", "Limit selection by seam boundaries (faces only)"); } @@ -2797,8 +2795,8 @@ static int hide_mesh_exec(bContext *C, wmOperator *op) void MESH_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide Selection"); - ot->description= _("Hide (un)selected vertices, edges or faces"); + ot->name= "Hide Selection"; + ot->description= "Hide (un)selected vertices, edges or faces"; ot->idname= "MESH_OT_hide"; /* api callbacks */ @@ -2809,7 +2807,7 @@ void MESH_OT_hide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } void EM_reveal_mesh(EditMesh *em) @@ -2864,8 +2862,8 @@ static int reveal_mesh_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal Hidden"); - ot->description= _("Reveal all hidden vertices, edges and faces"); + ot->name= "Reveal Hidden"; + ot->description= "Reveal all hidden vertices, edges and faces"; ot->idname= "MESH_OT_reveal"; /* api callbacks */ @@ -2915,14 +2913,14 @@ static int select_by_number_vertices_exec(bContext *C, wmOperator *op) void MESH_OT_select_by_number_vertices(wmOperatorType *ot) { static const EnumPropertyItem type_items[]= { - {3, "TRIANGLES", 0, N_("Triangles"), NULL}, - {4, "QUADS", 0, N_("Quads"), NULL}, - {5, "OTHER", 0, N_("Other"), NULL}, + {3, "TRIANGLES", 0, "Triangles", NULL}, + {4, "QUADS", 0, "Quads", NULL}, + {5, "OTHER", 0, "Other", NULL}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Select by Number of Vertices"); - ot->description= _("Select vertices or faces by vertex count"); + ot->name= "Select by Number of Vertices"; + ot->description= "Select vertices or faces by vertex count"; ot->idname= "MESH_OT_select_by_number_vertices"; /* api callbacks */ @@ -2934,7 +2932,7 @@ void MESH_OT_select_by_number_vertices(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 3, _("Type"), _("Type of elements to select.")); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, 3, "Type", "Type of elements to select."); } @@ -2955,8 +2953,8 @@ static int select_mirror_exec(bContext *C, wmOperator *op) void MESH_OT_select_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Mirror"); - ot->description= _("Select mesh items at mirrored locations"); + ot->name= "Select Mirror"; + ot->description= "Select mesh items at mirrored locations"; ot->idname= "MESH_OT_select_mirror"; /* api callbacks */ @@ -2967,7 +2965,7 @@ void MESH_OT_select_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend the existing selection")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the existing selection"); } static int select_sharp_edges_exec(bContext *C, wmOperator *op) @@ -3076,8 +3074,8 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) void MESH_OT_edges_select_sharp(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Sharp Edges"); - ot->description= _("Marked selected edges as sharp"); + ot->name= "Select Sharp Edges"; + ot->description= "Marked selected edges as sharp"; ot->idname= "MESH_OT_edges_select_sharp"; /* api callbacks */ @@ -3088,7 +3086,7 @@ void MESH_OT_edges_select_sharp(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float(ot->srna, "sharpness", 0.01f, 0.0f, FLT_MAX, _("sharpness"), "", 0.0f, 180.0f); + RNA_def_float(ot->srna, "sharpness", 0.01f, 0.0f, FLT_MAX, "sharpness", "", 0.0f, 180.0f); } @@ -3244,8 +3242,8 @@ static int select_linked_flat_faces_exec(bContext *C, wmOperator *op) void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked Flat Faces"); - ot->description= _("Select linked faces by angle"); + ot->name= "Select Linked Flat Faces"; + ot->description= "Select linked faces by angle"; ot->idname= "MESH_OT_faces_select_linked_flat"; /* api callbacks */ @@ -3256,7 +3254,7 @@ void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float(ot->srna, "sharpness", 135.0f, 0.0f, FLT_MAX, _("sharpness"), "", 0.0f, 180.0f); + RNA_def_float(ot->srna, "sharpness", 135.0f, 0.0f, FLT_MAX, "sharpness", "", 0.0f, 180.0f); } static void select_non_manifold(EditMesh *em, wmOperator *op ) @@ -3345,8 +3343,8 @@ static int select_non_manifold_exec(bContext *C, wmOperator *op) void MESH_OT_select_non_manifold(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Non Manifold"); - ot->description= _("Select all non-manifold vertices or edges"); + ot->name= "Select Non Manifold"; + ot->description= "Select all non-manifold vertices or edges"; ot->idname= "MESH_OT_select_non_manifold"; /* api callbacks */ @@ -3409,8 +3407,8 @@ static int select_inverse_mesh_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); - ot->description= _("Select inverse of (un)selected vertices, edges or faces"); + ot->name= "Select Inverse"; + ot->description= "Select inverse of (un)selected vertices, edges or faces"; ot->idname= "MESH_OT_select_inverse"; /* api callbacks */ @@ -3471,8 +3469,8 @@ static int select_all_exec(bContext *C, wmOperator *op) void MESH_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); - ot->description= _("Change selection of all vertices, edges or faces"); + ot->name= "Select or Deselect All"; + ot->description= "Change selection of all vertices, edges or faces"; ot->idname= "MESH_OT_select_all"; /* api callbacks */ @@ -3544,8 +3542,8 @@ static int select_more(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select More"); - ot->description= _("Select more vertices, edges or faces connected to initial selection"); + ot->name= "Select More"; + ot->description= "Select more vertices, edges or faces connected to initial selection"; ot->idname= "MESH_OT_select_more"; /* api callbacks */ @@ -3634,8 +3632,8 @@ static int select_less(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Less"); - ot->description= _("Select less vertices, edges or faces connected to initial selection"); + ot->name= "Select Less"; + ot->description= "Select less vertices, edges or faces connected to initial selection"; ot->idname= "MESH_OT_select_less"; /* api callbacks */ @@ -3704,8 +3702,8 @@ static int mesh_select_random_exec(bContext *C, wmOperator *op) void MESH_OT_select_random(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Random"); - ot->description= _("Randomly select vertices"); + ot->name= "Select Random"; + ot->description= "Randomly select vertices"; ot->idname= "MESH_OT_select_random"; /* api callbacks */ @@ -3716,8 +3714,8 @@ void MESH_OT_select_random(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, _("Percent"), _("Percentage of elements to select randomly."), 0.f, 100.0f); - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend Selection"), _("Extend selection instead of deselecting everything first.")); + RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, "Percent", "Percentage of elements to select randomly.", 0.f, 100.0f); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend Selection", "Extend selection instead of deselecting everything first."); } void EM_select_by_material(EditMesh *em, int index) @@ -3799,8 +3797,8 @@ static int editmesh_mark_seam(bContext *C, wmOperator *op) void MESH_OT_mark_seam(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mark Seam"); - ot->description= _("(un)mark selected edges as a seam"); + ot->name= "Mark Seam"; + ot->description= "(un)mark selected edges as a seam"; ot->idname= "MESH_OT_mark_seam"; /* api callbacks */ @@ -3810,7 +3808,7 @@ void MESH_OT_mark_seam(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "clear", 0, _("Clear"), ""); + RNA_def_boolean(ot->srna, "clear", 0, "Clear", ""); } static int editmesh_mark_sharp(bContext *C, wmOperator *op) @@ -3851,8 +3849,8 @@ static int editmesh_mark_sharp(bContext *C, wmOperator *op) void MESH_OT_mark_sharp(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mark Sharp"); - ot->description= _("(un)mark selected edges as sharp"); + ot->name= "Mark Sharp"; + ot->description= "(un)mark selected edges as sharp"; ot->idname= "MESH_OT_mark_sharp"; /* api callbacks */ @@ -3862,7 +3860,7 @@ void MESH_OT_mark_sharp(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "clear", 0, _("Clear"), ""); + RNA_def_boolean(ot->srna, "clear", 0, "Clear", ""); } /* **************** NORMALS ************** */ @@ -4095,8 +4093,8 @@ static int normals_make_consistent_exec(bContext *C, wmOperator *op) void MESH_OT_normals_make_consistent(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Normals Consistent"); - ot->description= _("Flip all selected vertex and face normals in a consistent direction"); + ot->name= "Make Normals Consistent"; + ot->description= "Flip all selected vertex and face normals in a consistent direction"; ot->idname= "MESH_OT_normals_make_consistent"; /* api callbacks */ @@ -4106,7 +4104,7 @@ void MESH_OT_normals_make_consistent(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "inside", 0, _("Inside"), ""); + RNA_def_boolean(ot->srna, "inside", 0, "Inside", ""); } /* **************** VERTEX DEFORMS *************** */ @@ -4273,8 +4271,8 @@ static int smooth_vertex_exec(bContext *C, wmOperator *op) void MESH_OT_vertices_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Smooth Vertex"); - ot->description= _("Flatten angles of selected vertices"); + ot->name= "Smooth Vertex"; + ot->description= "Flatten angles of selected vertices"; ot->idname= "MESH_OT_vertices_smooth"; /* api callbacks */ @@ -4284,10 +4282,10 @@ void MESH_OT_vertices_smooth(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "repeat", 1, 1, 100, _("Smooth Iterations"), "", 1, INT_MAX); - RNA_def_boolean(ot->srna, "xaxis", 1, _("X-Axis"), _("Smooth along the X axis.")); - RNA_def_boolean(ot->srna, "yaxis", 1, _("Y-Axis"), _("Smooth along the Y axis.")); - RNA_def_boolean(ot->srna, "zaxis", 1, _("Z-Axis"), _("Smooth along the Z axis.")); + RNA_def_int(ot->srna, "repeat", 1, 1, 100, "Smooth Iterations", "", 1, INT_MAX); + RNA_def_boolean(ot->srna, "xaxis", 1, "X-Axis", "Smooth along the X axis."); + RNA_def_boolean(ot->srna, "yaxis", 1, "Y-Axis", "Smooth along the Y axis."); + RNA_def_boolean(ot->srna, "zaxis", 1, "Z-Axis", "Smooth along the Z axis."); } static int mesh_noise_exec(bContext *C, wmOperator *op) @@ -4347,8 +4345,8 @@ static int mesh_noise_exec(bContext *C, wmOperator *op) void MESH_OT_noise(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Noise"); - ot->description= _("Use vertex coordinate as texture coordinate"); + ot->name= "Noise"; + ot->description= "Use vertex coordinate as texture coordinate"; ot->idname= "MESH_OT_noise"; /* api callbacks */ @@ -4358,7 +4356,7 @@ void MESH_OT_noise(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "factor", 0.1f, -FLT_MAX, FLT_MAX, _("Factor"), "", 0.0f, 1.0f); + RNA_def_float(ot->srna, "factor", 0.1f, -FLT_MAX, FLT_MAX, "Factor", "", 0.0f, 1.0f); } void flipface(EditMesh *em, EditFace *efa) @@ -4409,8 +4407,8 @@ static int flip_normals(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_flip_normals(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Flip Normals"); - ot->description= _("Toggle the direction of selected face's vertex and face normals"); + ot->name= "Flip Normals"; + ot->description= "Toggle the direction of selected face's vertex and face normals"; ot->idname= "MESH_OT_flip_normals"; /* api callbacks */ @@ -4451,8 +4449,8 @@ void MESH_OT_solidify(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= _("Solidify"); - ot->description= _("Create a solid skin by extruding, compensating for sharp angles"); + ot->name= "Solidify"; + ot->description= "Create a solid skin by extruding, compensating for sharp angles"; ot->idname= "MESH_OT_solidify"; /* api callbacks */ @@ -4462,7 +4460,7 @@ void MESH_OT_solidify(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - prop= RNA_def_float(ot->srna, "thickness", 0.01f, -FLT_MAX, FLT_MAX, _("Thickness"), "", -10.0f, 10.0f); + prop= RNA_def_float(ot->srna, "thickness", 0.01f, -FLT_MAX, FLT_MAX, "Thickness", "", -10.0f, 10.0f); RNA_def_property_ui_range(prop, -10, 10, 0.1, 4); } @@ -4486,7 +4484,7 @@ static int mesh_select_nth_exec(bContext *C, wmOperator *op) void MESH_OT_select_nth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Nth"); + ot->name= "Select Nth"; ot->description= ""; ot->idname= "MESH_OT_select_nth"; @@ -4497,6 +4495,6 @@ void MESH_OT_select_nth(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "nth", 2, 2, 100, _("Nth Selection"), "", 1, INT_MAX); + RNA_def_int(ot->srna, "nth", 2, 2, 100, "Nth Selection", "", 1, INT_MAX); } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 44412062be3..2dc82ae89fb 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -65,8 +65,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "BLI_heap.h" #include "BLI_scanfill.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_global.h" @@ -508,8 +506,8 @@ void MESH_OT_remove_doubles(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Remove Doubles"); - ot->description= _("Remove duplicate vertices"); + ot->name= "Remove Doubles"; + ot->description= "Remove duplicate vertices"; ot->idname= "MESH_OT_remove_doubles"; /* api callbacks */ @@ -519,7 +517,7 @@ void MESH_OT_remove_doubles(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - prop= RNA_def_float(ot->srna, "limit", 0.0001f, 0.000001f, 50.0f, _("Merge Threshold"), _("Minimum distance between merged verts"), 0.00001f, 2.0f); + prop= RNA_def_float(ot->srna, "limit", 0.0001f, 0.000001f, 50.0f, "Merge Threshold", "Minimum distance between merged verts", 0.00001f, 2.0f); RNA_def_property_ui_range(prop, 0.000001f, 50.0f, 0.001, 5); } @@ -580,8 +578,8 @@ static int mesh_vertices_sort_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertices_sort(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Vertex Sort"); - ot->description= _("Sort vertex order"); + ot->name= "Vertex Sort"; + ot->description= "Sort vertex order"; ot->idname= "MESH_OT_vertices_sort"; /* api callbacks */ @@ -663,8 +661,8 @@ static int mesh_vertices_randomize_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertices_randomize(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Vertex Randomize"); - ot->description= _("Randomize vertex order"); + ot->name= "Vertex Randomize"; + ot->description= "Randomize vertex order"; ot->idname= "MESH_OT_vertices_randomize"; /* api callbacks */ @@ -757,10 +755,10 @@ static int mesh_extrude_exec(bContext *C, wmOperator *op) } static EnumPropertyItem extrude_items[] = { - {1, "REGION", 0, N_("Region"), ""}, - {2, "FACES", 0, N_("Individual Faces"), ""}, - {3, "EDGES", 0, N_("Only Edges"), ""}, - {4, "VERTS", 0, N_("Only Vertices"), ""}, + {1, "REGION", 0, "Region", ""}, + {2, "FACES", 0, "Individual Faces", ""}, + {3, "EDGES", 0, "Only Edges", ""}, + {4, "VERTS", 0, "Only Vertices", ""}, {0, NULL, 0, NULL, NULL}}; @@ -837,8 +835,8 @@ void MESH_OT_extrude(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Extrude"); - ot->description= _("Extrude selected vertices, edges or faces"); + ot->name= "Extrude"; + ot->description= "Extrude selected vertices, edges or faces"; ot->idname= "MESH_OT_extrude"; /* api callbacks */ @@ -850,8 +848,7 @@ void MESH_OT_extrude(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - /* gettext extrude_items will raise segment fault */ - prop= RNA_def_enum(ot->srna, "type", extrude_items, 0, _("Type"), ""); + prop= RNA_def_enum(ot->srna, "type", extrude_items, 0, "Type", ""); RNA_def_property_flag(prop, PROP_HIDDEN); RNA_def_enum_funcs(prop, mesh_extrude_itemf); ot->prop= prop; @@ -882,8 +879,8 @@ static int split_mesh(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_split(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Split"); - ot->description= _("Split selected geometry into separate disconnected mesh"); + ot->name= "Split"; + ot->description= "Split selected geometry into separate disconnected mesh"; ot->idname= "MESH_OT_split"; /* api callbacks */ @@ -949,8 +946,8 @@ static int extrude_repeat_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void MESH_OT_extrude_repeat(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Extrude Repeat Mesh"); - ot->description= _("Extrude selected vertices, edges or faces repeatedly"); + ot->name= "Extrude Repeat Mesh"; + ot->description= "Extrude selected vertices, edges or faces repeatedly"; ot->idname= "MESH_OT_extrude_repeat"; /* api callbacks */ @@ -962,9 +959,9 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float(ot->srna, "offset", 2.0f, 0.0f, 100.0f, _("Offset"), "", 0.0f, 100.0f); - RNA_def_int(ot->srna, "steps", 10, 0, 180, _("Steps"), "", 0, 180); - RNA_def_float_vector(ot->srna, "direction", 3, NULL, -FLT_MAX, FLT_MAX, _("Direction"), _("Direction of extrude"), -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "offset", 2.0f, 0.0f, 100.0f, "Offset", "", 0.0f, 100.0f); + RNA_def_int(ot->srna, "steps", 10, 0, 180, "Steps", "", 0, 180); + RNA_def_float_vector(ot->srna, "direction", 3, NULL, -FLT_MAX, FLT_MAX, "Direction", "Direction of extrude", -FLT_MAX, FLT_MAX); } /* ************************** spin operator ******************** */ @@ -1085,8 +1082,8 @@ static int spin_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void MESH_OT_spin(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Spin"); - ot->description= _("Extrude selected vertices in a circle around the cursor in indicated viewport"); + ot->name= "Spin"; + ot->description= "Extrude selected vertices in a circle around the cursor in indicated viewport"; ot->idname= "MESH_OT_spin"; /* api callbacks */ @@ -1098,12 +1095,12 @@ void MESH_OT_spin(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "steps", 9, 0, INT_MAX, _("Steps"), _("Steps"), 0, 128); - RNA_def_boolean(ot->srna, "dupli", 0, _("Dupli"), _("Make Duplicates")); - RNA_def_float(ot->srna, "degrees", 90.0f, -FLT_MAX, FLT_MAX, _("Degrees"), _("Degrees"), -360.0f, 360.0f); + RNA_def_int(ot->srna, "steps", 9, 0, INT_MAX, "Steps", "Steps", 0, 128); + RNA_def_boolean(ot->srna, "dupli", 0, "Dupli", "Make Duplicates"); + RNA_def_float(ot->srna, "degrees", 90.0f, -FLT_MAX, FLT_MAX, "Degrees", "Degrees", -360.0f, 360.0f); - RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, _("Center"), _("Center in global view space"), -FLT_MAX, FLT_MAX); - RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, _("Axis"), _("Axis in global view space"), -FLT_MAX, FLT_MAX); + RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, "Center", "Center in global view space", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -FLT_MAX, FLT_MAX); } @@ -1191,8 +1188,8 @@ static int screw_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void MESH_OT_screw(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Screw"); - ot->description= _("Extrude selected vertices in screw-shaped rotation around the cursor in indicated viewport"); + ot->name= "Screw"; + ot->description= "Extrude selected vertices in screw-shaped rotation around the cursor in indicated viewport"; ot->idname= "MESH_OT_screw"; /* api callbacks */ @@ -1204,11 +1201,11 @@ void MESH_OT_screw(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /*props */ - RNA_def_int(ot->srna, "steps", 9, 0, INT_MAX, _("Steps"), _("Steps"), 0, 256); - RNA_def_int(ot->srna, "turns", 1, 0, INT_MAX, _("Turns"), _("Turns"), 0, 256); + RNA_def_int(ot->srna, "steps", 9, 0, INT_MAX, "Steps", "Steps", 0, 256); + RNA_def_int(ot->srna, "turns", 1, 0, INT_MAX, "Turns", "Turns", 0, 256); - RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, _("Center"), _("Center in global view space"), -FLT_MAX, FLT_MAX); - RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, _("Axis"), _("Axis in global view space"), -FLT_MAX, FLT_MAX); + RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, "Center", "Center in global view space", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -FLT_MAX, FLT_MAX); } static void erase_edges(EditMesh *em, ListBase *l) @@ -1396,13 +1393,13 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event) /* Note, these values must match delete_mesh() event values */ static EnumPropertyItem prop_mesh_delete_types[] = { - {10,"VERT", 0, N_("Vertices"), ""}, - {1, "EDGE", 0, N_("Edges"), ""}, - {2, "FACE", 0, N_("Faces"), ""}, - {3, "ALL", 0, N_("All"), ""}, - {4, "EDGE_FACE",0, N_("Edges & Faces"), ""}, - {5, "ONLY_FACE",0, N_("Only Faces"), ""}, - {6, "EDGE_LOOP",0, N_("Edge Loop"), ""}, + {10,"VERT", 0, "Vertices", ""}, + {1, "EDGE", 0, "Edges", ""}, + {2, "FACE", 0, "Faces", ""}, + {3, "ALL", 0, "All", ""}, + {4, "EDGE_FACE",0, "Edges & Faces", ""}, + {5, "ONLY_FACE",0, "Only Faces", ""}, + {6, "EDGE_LOOP",0, "Edge Loop", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1427,8 +1424,8 @@ static int delete_mesh_exec(bContext *C, wmOperator *op) void MESH_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); - ot->description= _("Delete selected vertices, edges or faces"); + ot->name= "Delete"; + ot->description= "Delete selected vertices, edges or faces"; ot->idname= "MESH_OT_delete"; /* api callbacks */ @@ -1441,7 +1438,7 @@ void MESH_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /*props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_mesh_delete_types), 10, _("Type"), _("Method used for deleting mesh data")); + ot->prop= RNA_def_enum(ot->srna, "type", prop_mesh_delete_types, 10, "Type", "Method used for deleting mesh data"); } @@ -5116,8 +5113,8 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_rip(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rip"); - ot->description= _("Rip selection from mesh (quads only)"); + ot->name= "Rip"; + ot->description= "Rip selection from mesh (quads only)"; ot->idname= "MESH_OT_rip"; /* api callbacks */ @@ -5197,8 +5194,8 @@ static int shape_propagate_to_all_exec(bContext *C, wmOperator *op) void MESH_OT_shape_propagate_to_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shape Propagate"); - ot->description= _("Apply selected vertex locations to all other shape keys"); + ot->name= "Shape Propagate"; + ot->description= "Apply selected vertex locations to all other shape keys"; ot->idname= "MESH_OT_shape_propagate_to_all"; /* api callbacks */ @@ -5303,8 +5300,8 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot) static EnumPropertyItem shape_items[]= {{0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Blend From Shape"); - ot->description= _("Blend in shape from a shape key"); + ot->name= "Blend From Shape"; + ot->description= "Blend in shape from a shape key"; ot->idname= "MESH_OT_blend_from_shape"; /* api callbacks */ @@ -5316,10 +5313,10 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "shape", shape_items, 0, _("Shape"), _("Shape key to use for blending.")); + prop= RNA_def_enum(ot->srna, "shape", shape_items, 0, "Shape", "Shape key to use for blending."); RNA_def_enum_funcs(prop, shape_itemf); - RNA_def_float(ot->srna, "blend", 1.0f, -FLT_MAX, FLT_MAX, _("Blend"), _("Blending factor."), -2.0f, 2.0f); - RNA_def_boolean(ot->srna, "add", 0, _("Add"), _("Add rather than blend between shapes.")); + RNA_def_float(ot->srna, "blend", 1.0f, -FLT_MAX, FLT_MAX, "Blend", "Blending factor.", -2.0f, 2.0f); + RNA_def_boolean(ot->srna, "add", 0, "Add", "Add rather than blend between shapes."); } /************************ Merge Operator *************************/ @@ -5971,11 +5968,11 @@ static int merge_exec(bContext *C, wmOperator *op) } static EnumPropertyItem merge_type_items[]= { - {6, "FIRST", 0, N_("At First"), ""}, - {1, "LAST", 0, N_("At Last"), ""}, - {3, "CENTER", 0, N_("At Center"), ""}, - {4, "CURSOR", 0, N_("At Cursor"), ""}, - {5, "COLLAPSE", 0, N_("Collapse"), ""}, + {6, "FIRST", 0, "At First", ""}, + {1, "LAST", 0, "At Last", ""}, + {3, "CENTER", 0, "At Center", ""}, + {4, "CURSOR", 0, "At Cursor", ""}, + {5, "COLLAPSE", 0, "Collapse", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem *merge_type_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free) @@ -6019,8 +6016,8 @@ void MESH_OT_merge(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Merge"); - ot->description= _("Merge selected vertices"); + ot->name= "Merge"; + ot->description= "Merge selected vertices"; ot->idname= "MESH_OT_merge"; /* api callbacks */ @@ -6032,10 +6029,10 @@ void MESH_OT_merge(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", merge_type_items, 3, _("Type"), _("Merge method to use.")); + prop= RNA_def_enum(ot->srna, "type", merge_type_items, 3, "Type", "Merge method to use."); RNA_def_enum_funcs(prop, merge_type_itemf); ot->prop= prop; - RNA_def_boolean(ot->srna, "uvs", 0, _("UVs"), _("Move UVs according to merge.")); + RNA_def_boolean(ot->srna, "uvs", 0, "UVs", "Move UVs according to merge."); } /************************ Vertex Path Operator *************************/ @@ -6222,13 +6219,13 @@ static int select_vertex_path_exec(bContext *C, wmOperator *op) void MESH_OT_select_vertex_path(wmOperatorType *ot) { static const EnumPropertyItem type_items[] = { - {PATH_SELECT_EDGE_LENGTH, "EDGE_LENGTH", 0, N_("Edge Length"), NULL}, - {PATH_SELECT_TOPOLOGICAL, "TOPOLOGICAL", 0, N_("Topological"), NULL}, + {PATH_SELECT_EDGE_LENGTH, "EDGE_LENGTH", 0, "Edge Length", NULL}, + {PATH_SELECT_TOPOLOGICAL, "TOPOLOGICAL", 0, "Topological", NULL}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Select Vertex Path"); - ot->description= _("Select shortest path between two vertices by distance type"); + ot->name= "Select Vertex Path"; + ot->description= "Select shortest path between two vertices by distance type"; ot->idname= "MESH_OT_select_vertex_path"; /* api callbacks */ @@ -6239,7 +6236,7 @@ void MESH_OT_select_vertex_path(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, PATH_SELECT_EDGE_LENGTH, _("Type"), _("Method to compute distance.")); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, PATH_SELECT_EDGE_LENGTH, "Type", "Method to compute distance."); } /********************** Region/Loop Operators *************************/ @@ -6289,8 +6286,8 @@ static int region_to_loop(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_region_to_loop(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Region to Loop"); - ot->description= _("Select a region as a loop of connected edges"); + ot->name= "Region to Loop"; + ot->description= "Select a region as a loop of connected edges"; ot->idname= "MESH_OT_region_to_loop"; /* api callbacks */ @@ -6465,8 +6462,8 @@ static int loop_to_region(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_loop_to_region(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Loop to Region"); - ot->description= _("Select a loop of connected edges as a region"); + ot->name= "Loop to Region"; + ot->description= "Select a loop of connected edges as a region"; ot->idname= "MESH_OT_loop_to_region"; /* api callbacks */ @@ -6760,8 +6757,8 @@ static int mesh_mirror_colors(bContext *C, wmOperator *op) void MESH_OT_uvs_rotate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rotate UVs"); - ot->description= _("Rotate selected UVs"); + ot->name= "Rotate UVs"; + ot->description= "Rotate selected UVs"; ot->idname= "MESH_OT_uvs_rotate"; /* api callbacks */ @@ -6772,14 +6769,14 @@ void MESH_OT_uvs_rotate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, _("Direction"), _("Direction to rotate UVs around.")); + RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, "Direction", "Direction to rotate UVs around."); } void MESH_OT_uvs_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror UVs"); - ot->description= _("Mirror selected UVs"); + ot->name= "Mirror UVs"; + ot->description= "Mirror selected UVs"; ot->idname= "MESH_OT_uvs_mirror"; /* api callbacks */ @@ -6790,14 +6787,14 @@ void MESH_OT_uvs_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, _("Axis"), _("Axis to mirror UVs around.")); + RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, "Axis", "Axis to mirror UVs around."); } void MESH_OT_colors_rotate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rotate Colors"); - ot->description= _("Rotate UV/image color layer"); + ot->name= "Rotate Colors"; + ot->description= "Rotate UV/image color layer"; ot->idname= "MESH_OT_colors_rotate"; /* api callbacks */ @@ -6808,14 +6805,14 @@ void MESH_OT_colors_rotate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, _("Direction"), _("Direction to rotate edge around.")); + RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, "Direction", "Direction to rotate edge around."); } void MESH_OT_colors_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror Colors"); - ot->description= _("Mirror UV/image color layer"); + ot->name= "Mirror Colors"; + ot->description= "Mirror UV/image color layer"; ot->idname= "MESH_OT_colors_mirror"; /* api callbacks */ @@ -6826,7 +6823,7 @@ void MESH_OT_colors_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, _("Axis"), _("Axis to mirror colors around.")); + RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, "Axis", "Axis to mirror colors around."); } /********************** Subdivide Operator *************************/ @@ -6858,8 +6855,8 @@ static int subdivide_exec(bContext *C, wmOperator *op) void MESH_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Subdivide"); - ot->description= _("Subdivide selected edges"); + ot->name= "Subdivide"; + ot->description= "Subdivide selected edges"; ot->idname= "MESH_OT_subdivide"; /* api callbacks */ @@ -6870,10 +6867,10 @@ void MESH_OT_subdivide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, _("Number of Cuts"), "", 1, 10); - RNA_def_float(ot->srna, "smoothness", 0.0f, 0.0f, FLT_MAX, _("Smoothness"), _("Smoothness factor."), 0.0f, 1.0f); - RNA_def_float(ot->srna, "fractal", 0.0, 0.0f, FLT_MAX, _("Fractal"), _("Fractal randomness factor."), 0.0f, 1000.0f); - RNA_def_enum(ot->srna, "corner_cut_pattern", corner_type_items, SUBDIV_CORNER_INNERVERT, _("Corner Cut Pattern"), _("Topology pattern to use to fill a face after cutting across its corner")); + RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10); + RNA_def_float(ot->srna, "smoothness", 0.0f, 0.0f, FLT_MAX, "Smoothness", "Smoothness factor.", 0.0f, 1.0f); + RNA_def_float(ot->srna, "fractal", 0.0, 0.0f, FLT_MAX, "Fractal", "Fractal randomness factor.", 0.0f, 1000.0f); + RNA_def_enum(ot->srna, "corner_cut_pattern", corner_type_items, SUBDIV_CORNER_INNERVERT, "Corner Cut Pattern", "Topology pattern to use to fill a face after cutting across its corner"); } /********************** Fill Operators *************************/ @@ -7141,8 +7138,8 @@ static int fill_mesh_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_fill(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Fill"); - ot->description= _("Create a segment, edge or face"); + ot->name= "Fill"; + ot->description= "Create a segment, edge or face"; ot->idname= "MESH_OT_fill"; /* api callbacks */ @@ -7171,8 +7168,8 @@ static int beautify_fill_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_beautify_fill(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Beautify Fill"); - ot->description= _("Rearrange geometry on a selected surface to avoid skinny faces"); + ot->name= "Beautify Fill"; + ot->description= "Rearrange geometry on a selected surface to avoid skinny faces"; ot->idname= "MESH_OT_beautify_fill"; /* api callbacks */ @@ -7337,16 +7334,16 @@ static int sort_faces_exec(bContext *C, wmOperator *op) void MESH_OT_sort_faces(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - { 1, "VIEW_AXIS", 0, N_("View Axis"), "" }, - { 2, "CURSOR_DISTANCE", 0, N_("Cursor Distance"), "" }, - { 3, "MATERIAL", 0, N_("Material"), "" }, - { 4, "SELECTED", 0, N_("Selected"), "" }, - { 5, "RANDOMIZE", 0, N_("Randomize"), "" }, + { 1, "VIEW_AXIS", 0, "View Axis", "" }, + { 2, "CURSOR_DISTANCE", 0, "Cursor Distance", "" }, + { 3, "MATERIAL", 0, "Material", "" }, + { 4, "SELECTED", 0, "Selected", "" }, + { 5, "RANDOMIZE", 0, "Randomize", "" }, { 0, NULL, 0, NULL, NULL }}; /* identifiers */ - ot->name= _("Sort Faces"); // XXX (Ctrl to reverse)%t| - ot->description= _("The faces of the active Mesh Object are sorted, based on the current view."); + ot->name= "Sort Faces"; // XXX (Ctrl to reverse)%t| + ot->description= "The faces of the active Mesh Object are sorted, based on the current view."; ot->idname= "MESH_OT_sort_faces"; /* api callbacks */ @@ -7358,7 +7355,7 @@ void MESH_OT_sort_faces(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); } /********************** Quad/Tri Operators *************************/ @@ -7380,8 +7377,8 @@ static int quads_convert_to_tris_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_quads_convert_to_tris(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Quads to Tris"); - ot->description= _("Convert selected quads to triangles"); + ot->name= "Quads to Tris"; + ot->description= "Convert selected quads to triangles"; ot->idname= "MESH_OT_quads_convert_to_tris"; /* api callbacks */ @@ -7409,8 +7406,8 @@ static int tris_convert_to_quads_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_tris_convert_to_quads(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Tris to Quads"); - ot->description= _("Convert selected triangles to quads"); + ot->name= "Tris to Quads"; + ot->description= "Convert selected triangles to quads"; ot->idname= "MESH_OT_tris_convert_to_quads"; /* api callbacks */ @@ -7438,8 +7435,8 @@ static int edge_flip_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_edge_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Edge Flip"); - ot->description= _("Flip selected edge or adjoining faces"); + ot->name= "Edge Flip"; + ot->description= "Flip selected edge or adjoining faces"; ot->idname= "MESH_OT_edge_flip"; /* api callbacks */ @@ -7486,8 +7483,8 @@ static int mesh_faces_shade_smooth_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_faces_shade_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shade Smooth"); - ot->description= _("Display faces 'smooth' (using vertex normals)"); + ot->name= "Shade Smooth"; + ot->description= "Display faces 'smooth' (using vertex normals)"; ot->idname= "MESH_OT_faces_shade_smooth"; /* api callbacks */ @@ -7514,8 +7511,8 @@ static int mesh_faces_shade_flat_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_faces_shade_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shade Flat"); - ot->description= _("Display faces 'flat'"); + ot->name= "Shade Flat"; + ot->description= "Display faces 'flat'"; ot->idname= "MESH_OT_faces_shade_flat"; /* api callbacks */ @@ -7579,20 +7576,20 @@ static int select_axis_exec(bContext *C, wmOperator *op) void MESH_OT_select_axis(wmOperatorType *ot) { static EnumPropertyItem axis_mode_items[] = { - {0, "POSITIVE", 0, N_("Positive Axis"), ""}, - {1, "NEGATIVE", 0, N_("Negative Axis"), ""}, - {-1, "ALIGNED", 0, N_("Aligned Axis"), ""}, + {0, "POSITIVE", 0, "Positive Axis", ""}, + {1, "NEGATIVE", 0, "Negative Axis", ""}, + {-1, "ALIGNED", 0, "Aligned Axis", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem axis_items_xyz[] = { - {0, "X_AXIS", 0, N_("X Axis"), ""}, - {1, "Y_AXIS", 0, N_("Y Axis"), ""}, - {2, "Z_AXIS", 0, N_("Z Axis"), ""}, + {0, "X_AXIS", 0, "X Axis", ""}, + {1, "Y_AXIS", 0, "Y Axis", ""}, + {2, "Z_AXIS", 0, "Z Axis", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Select Axis"); - ot->description= _("Select all data in the mesh on a single axis"); + ot->name= "Select Axis"; + ot->description= "Select all data in the mesh on a single axis"; ot->idname= "MESH_OT_select_axis"; /* api callbacks */ @@ -7603,7 +7600,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(axis_mode_items), 0, _("Axis Mode"), _("Axis side to use when selecting")); - RNA_def_enum(ot->srna, "axis", RNA_enum_items_gettexted(axis_items_xyz), 0, _("Axis"), _("Select the axis to compare each vertex on")); + RNA_def_enum(ot->srna, "mode", axis_mode_items, 0, "Axis Mode", "Axis side to use when selecting"); + RNA_def_enum(ot->srna, "axis", axis_items_xyz, 0, "Axis", "Select the axis to compare each vertex on"); } diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 62a512fe11a..0ec356a88ae 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -53,8 +53,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_blender.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -512,9 +510,9 @@ static int ringcut_modal (bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_edgering_select (wmOperatorType *ot) { /* description */ - ot->name= _("Edge Ring Select"); + ot->name= "Edge Ring Select"; ot->idname= "MESH_OT_edgering_select"; - ot->description= _("Select an edge ring"); + ot->description= "Select an edge ring"; /* callbacks */ ot->invoke= ringsel_invoke; @@ -523,15 +521,15 @@ void MESH_OT_edgering_select (wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend the selection")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection"); } void MESH_OT_loopcut (wmOperatorType *ot) { /* description */ - ot->name= _("Loop Cut"); + ot->name= "Loop Cut"; ot->idname= "MESH_OT_loopcut"; - ot->description= _("Add a new loop between existing loops"); + ot->description= "Add a new loop between existing loops"; /* callbacks */ ot->invoke= ringcut_invoke; @@ -543,5 +541,5 @@ void MESH_OT_loopcut (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, _("Number of Cuts"), "", 1, 10); + RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10); } diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 73c9f817497..c4a302d4d18 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -48,8 +48,6 @@ #include "BLI_edgehash.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_displist.h" @@ -324,8 +322,8 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_uv_texture_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add UV Texture"); - ot->description= _("Add UV texture layer"); + ot->name= "Add UV Texture"; + ot->description= "Add UV texture layer"; ot->idname= "MESH_OT_uv_texture_add"; /* api callbacks */ @@ -403,8 +401,8 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_drop_named_image(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Assign Image to UV Texture"); - ot->description= _("Assigns Image to active UV layer, or creates a UV layer"); + ot->name= "Assign Image to UV Texture"; + ot->description= "Assigns Image to active UV layer, or creates a UV layer"; ot->idname= "MESH_OT_drop_named_image"; /* api callbacks */ @@ -415,8 +413,8 @@ void MESH_OT_drop_named_image(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "name", "Image", 24, _("Name"), _("Image name to assign.")); - RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, _("Filepath"), _("Path to image file")); + RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Image name to assign."); + RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath", "Path to image file"); } static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -433,8 +431,8 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_uv_texture_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove UV Texture"); - ot->description= _("Remove UV texture layer"); + ot->name= "Remove UV Texture"; + ot->description= "Remove UV texture layer"; ot->idname= "MESH_OT_uv_texture_remove"; /* api callbacks */ @@ -462,8 +460,8 @@ static int vertex_color_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertex_color_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Vertex Color"); - ot->description= _("Add vertex color layer"); + ot->name= "Add Vertex Color"; + ot->description= "Add vertex color layer"; ot->idname= "MESH_OT_vertex_color_add"; /* api callbacks */ @@ -488,8 +486,8 @@ static int vertex_color_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertex_color_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Vertex Color"); - ot->description= _("Remove vertex color layer"); + ot->name= "Remove Vertex Color"; + ot->description= "Remove vertex color layer"; ot->idname= "MESH_OT_vertex_color_remove"; /* api callbacks */ @@ -523,8 +521,8 @@ static int sticky_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_sticky_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Sticky"); - ot->description= _("Add sticky UV texture layer"); + ot->name= "Add Sticky"; + ot->description= "Add sticky UV texture layer"; ot->idname= "MESH_OT_sticky_add"; /* api callbacks */ @@ -555,8 +553,8 @@ static int sticky_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_sticky_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Sticky"); - ot->description= _("Remove sticky UV texture layer"); + ot->name= "Remove Sticky"; + ot->description= "Remove sticky UV texture layer"; ot->idname= "MESH_OT_sticky_remove"; /* api callbacks */ diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 077ad756150..282eeef906f 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -42,8 +42,6 @@ #include "BLI_blenlib.h" #include "BLI_editVert.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "RNA_access.h" @@ -174,52 +172,52 @@ void ED_operatormacros_mesh(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("MESH_OT_loopcut_slide", _("Loop Cut and Slide"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Cut mesh loop and slide it"); + ot= WM_operatortype_append_macro("MESH_OT_loopcut_slide", "Loop Cut and Slide", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Cut mesh loop and slide it"; WM_operatortype_macro_define(ot, "MESH_OT_loopcut"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_edge_slide"); RNA_struct_idprops_unset(otmacro->ptr, "release_confirm"); - ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", _("Add Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Duplicate mesh and move"); + ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", "Add Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Duplicate mesh and move"; WM_operatortype_macro_define(ot, "MESH_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_rip_move", _("Rip"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Rip polygons and move the result"); + ot= WM_operatortype_append_macro("MESH_OT_rip_move", "Rip", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Rip polygons and move the result"; WM_operatortype_macro_define(ot, "MESH_OT_rip"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_region_move", _("Extrude Region and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Extrude region and move result"); + ot= WM_operatortype_append_macro("MESH_OT_extrude_region_move", "Extrude Region and Move", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Extrude region and move result"; otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 1); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_faces_move", _("Extrude Individual Faces and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Extrude faces and move result"); + ot= WM_operatortype_append_macro("MESH_OT_extrude_faces_move", "Extrude Individual Faces and Move", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Extrude faces and move result"; otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 2); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_shrink_fatten"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_edges_move", _("Extrude Only Edges and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Extrude edges and move result"); + ot= WM_operatortype_append_macro("MESH_OT_extrude_edges_move", "Extrude Only Edges and Move", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Extrude edges and move result"; otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 3); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_vertices_move", _("Extrude Only Vertices and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = _("Extrude vertices and move result"); + ot= WM_operatortype_append_macro("MESH_OT_extrude_vertices_move", "Extrude Only Vertices and Move", OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = "Extrude vertices and move result"; otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 4); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 41ed5da4f09..76561b12183 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/metaball/SConscript b/source/blender/editors/metaball/SConscript index 327e85b95f9..b1a1ce935db 100644 --- a/source/blender/editors/metaball/SConscript +++ b/source/blender/editors/metaball/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu ../../blenloader' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index c14f57d6c8c..b007e30422d 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -42,8 +42,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -170,8 +168,8 @@ static int select_all_exec(bContext *C, wmOperator *op) void MBALL_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); - ot->description= _("Change selection of all meta elements"); + ot->name= "Select or Deselect All"; + ot->description= "Change selection of all meta elements"; ot->idname= "MBALL_OT_select_all"; /* callback functions */ @@ -211,8 +209,8 @@ static int select_inverse_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_select_inverse_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Inverse"); - ot->description= _("Select inverse of (un)selected metaelements"); + ot->name= "Inverse"; + ot->description= "Select inverse of (un)selected metaelements"; ot->idname= "MBALL_OT_select_inverse_metaelems"; /* callback functions */ @@ -257,8 +255,8 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op) void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Random..."); - ot->description= _("Randomly select metaelements"); + ot->name= "Random..."; + ot->description= "Randomly select metaelements"; ot->idname= "MBALL_OT_select_random_metaelems"; /* callback functions */ @@ -270,7 +268,7 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, _("Percent"), _("Percentage of metaelems to select randomly."), 0.0001f, 1.0f); + RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of metaelems to select randomly.", 0.0001f, 1.0f); } /***************************** Duplicate operator *****************************/ @@ -316,8 +314,8 @@ static int duplicate_metaelems_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Metaelements"); - ot->description= _("Delete selected metaelement(s)"); + ot->name= "Duplicate Metaelements"; + ot->description= "Delete selected metaelement(s)"; ot->idname= "MBALL_OT_duplicate_metaelems"; /* callback functions */ @@ -329,7 +327,7 @@ void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /***************************** Delete operator *****************************/ @@ -362,8 +360,8 @@ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_delete_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); - ot->description= _("Delete selected metaelement(s)"); + ot->name= "Delete"; + ot->description= "Delete selected metaelement(s)"; ot->idname= "MBALL_OT_delete_metaelems"; /* callback functions */ @@ -402,8 +400,8 @@ static int hide_metaelems_exec(bContext *C, wmOperator *op) void MBALL_OT_hide_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide"); - ot->description= _("Hide (un)selected metaelement(s)"); + ot->name= "Hide"; + ot->description= "Hide (un)selected metaelement(s)"; ot->idname= "MBALL_OT_hide_metaelems"; /* callback functions */ @@ -414,7 +412,7 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } /***************************** Unhide operator *****************************/ @@ -443,8 +441,8 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_reveal_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal"); - ot->description= _("Reveal all hidden metaelements"); + ot->name= "Reveal"; + ot->description= "Reveal all hidden metaelements"; ot->idname= "MBALL_OT_reveal_metaelems"; /* callback functions */ diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index da6b8d997d4..b9b8ddc6305 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index ba52d1a0edd..cdda16582ef 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') + env.Glob('*.cpp') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader' incs += ' ../../makesrna ../../python ../../ikplugin' incs += ' ../../render/extern/include ../../gpu' # for object_bake.c diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index a520536f452..0292977f816 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -53,8 +53,6 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_anim.h" #include "BKE_animsys.h" #include "BKE_armature.h" @@ -182,15 +180,15 @@ void ED_object_add_generic_props(wmOperatorType *ot, int do_editmode) PropertyRNA *prop; /* note: this property gets hidden for add-camera operator */ - RNA_def_boolean(ot->srna, "view_align", 0, _("Align to View"), _("Align the new object to the view")); + RNA_def_boolean(ot->srna, "view_align", 0, "Align to View", "Align the new object to the view"); if(do_editmode) { - prop= RNA_def_boolean(ot->srna, "enter_editmode", 0, _("Enter Editmode"), _("Enter editmode when adding this object")); + prop= RNA_def_boolean(ot->srna, "enter_editmode", 0, "Enter Editmode", "Enter editmode when adding this object"); RNA_def_property_flag(prop, PROP_HIDDEN); } - RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Location for the newly added object"), -FLT_MAX, FLT_MAX); - RNA_def_float_rotation(ot->srna, "rotation", 3, NULL, -FLT_MAX, FLT_MAX, _("Rotation"), _("Rotation for the newly added object"), (float)-M_PI * 2.0f, (float)M_PI * 2.0f); + RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Location for the newly added object", -FLT_MAX, FLT_MAX); + RNA_def_float_rotation(ot->srna, "rotation", 3, NULL, -FLT_MAX, FLT_MAX, "Rotation", "Rotation for the newly added object", (float)-M_PI * 2.0f, (float)M_PI * 2.0f); prop = RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", ""); RNA_def_property_flag(prop, PROP_HIDDEN); @@ -346,8 +344,8 @@ static int object_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Object"); - ot->description = _("Add an object to the scene"); + ot->name= "Add Object"; + ot->description = "Add an object to the scene"; ot->idname= "OBJECT_OT_add"; /* api callbacks */ @@ -359,7 +357,7 @@ void OBJECT_OT_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(object_type_items), 0, _("Type"), ""); + RNA_def_enum(ot->srna, "type", object_type_items, 0, "Type", ""); ED_object_add_generic_props(ot, TRUE); } @@ -367,18 +365,18 @@ void OBJECT_OT_add(wmOperatorType *ot) /********************* Add Effector Operator ********************/ /* copy from rna_object_force.c*/ static EnumPropertyItem field_type_items[] = { - {PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, N_("Force"), ""}, - {PFIELD_WIND, "WIND", ICON_FORCE_WIND, N_("Wind"), ""}, - {PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, N_("Vortex"), ""}, - {PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, N_("Magnetic"), ""}, - {PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, N_("Harmonic"), ""}, - {PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, N_("Charge"), ""}, - {PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, N_("Lennard-Jones"), ""}, - {PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, N_("Texture"), ""}, - {PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, N_("Curve Guide"), ""}, - {PFIELD_BOID, "BOID", ICON_FORCE_BOID, N_("Boid"), ""}, - {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, N_("Turbulence"), ""}, - {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, N_("Drag"), ""}, + {PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, "Force", ""}, + {PFIELD_WIND, "WIND", ICON_FORCE_WIND, "Wind", ""}, + {PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, "Vortex", ""}, + {PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, "Magnetic", ""}, + {PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, "Harmonic", ""}, + {PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, "Charge", ""}, + {PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, "Lennard-Jones", ""}, + {PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, "Texture", ""}, + {PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, "Curve Guide", ""}, + {PFIELD_BOID, "BOID", ICON_FORCE_BOID, "Boid", ""}, + {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, "Turbulence", ""}, + {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, "Drag", ""}, {0, NULL, 0, NULL, NULL}}; /* for effector add primitive operators */ @@ -438,8 +436,8 @@ static int effector_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_effector_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Effector"); - ot->description = _("Add an empty object with a physics effector to the scene"); + ot->name= "Add Effector"; + ot->description = "Add an empty object with a physics effector to the scene"; ot->idname= "OBJECT_OT_effector_add"; /* api callbacks */ @@ -451,7 +449,7 @@ void OBJECT_OT_effector_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(field_type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", field_type_items, 0, "Type", ""); ED_object_add_generic_props(ot, TRUE); } @@ -493,8 +491,8 @@ void OBJECT_OT_camera_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Add Camera"); - ot->description = _("Add a camera object to the scene"); + ot->name= "Add Camera"; + ot->description = "Add a camera object to the scene"; ot->idname= "OBJECT_OT_camera_add"; /* api callbacks */ @@ -571,8 +569,8 @@ static int object_metaball_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void OBJECT_OT_metaball_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Metaball"); - ot->description= _("Add an metaball object to the scene"); + ot->name= "Add Metaball"; + ot->description= "Add an metaball object to the scene"; ot->idname= "OBJECT_OT_metaball_add"; /* api callbacks */ @@ -583,7 +581,7 @@ void OBJECT_OT_metaball_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(metaelem_type_items), 0, _("Primitive"), ""); + RNA_def_enum(ot->srna, "type", metaelem_type_items, 0, "Primitive", ""); ED_object_add_generic_props(ot, TRUE); } @@ -611,8 +609,8 @@ static int object_add_text_exec(bContext *C, wmOperator *op) void OBJECT_OT_text_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Text"); - ot->description = _("Add a text object to the scene"); + ot->name= "Add Text"; + ot->description = "Add a text object to the scene"; ot->idname= "OBJECT_OT_text_add"; /* api callbacks */ @@ -666,8 +664,8 @@ static int object_armature_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_armature_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Armature"); - ot->description = _("Add an armature object to the scene"); + ot->name= "Add Armature"; + ot->description = "Add an armature object to the scene"; ot->idname= "OBJECT_OT_armature_add"; /* api callbacks */ @@ -716,16 +714,16 @@ static int object_lamp_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_lamp_add(wmOperatorType *ot) { static EnumPropertyItem lamp_type_items[] = { - {LA_LOCAL, "POINT", ICON_LAMP_POINT, N_("Point"), N_("Omnidirectional point light source")}, - {LA_SUN, "SUN", ICON_LAMP_SUN, N_("Sun"), N_("Constant direction parallel ray light source")}, - {LA_SPOT, "SPOT", ICON_LAMP_SPOT, N_("Spot"), N_("Directional cone light source")}, - {LA_HEMI, "HEMI", ICON_LAMP_HEMI, N_("Hemi"), N_("180 degree constant light source")}, - {LA_AREA, "AREA", ICON_LAMP_AREA, N_("Area"), N_("Directional area light source")}, + {LA_LOCAL, "POINT", ICON_LAMP_POINT, "Point", "Omnidirectional point light source"}, + {LA_SUN, "SUN", ICON_LAMP_SUN, "Sun", "Constant direction parallel ray light source"}, + {LA_SPOT, "SPOT", ICON_LAMP_SPOT, "Spot", "Directional cone light source"}, + {LA_HEMI, "HEMI", ICON_LAMP_HEMI, "Hemi", "180 degree constant light source"}, + {LA_AREA, "AREA", ICON_LAMP_AREA, "Area", "Directional area light source"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Add Lamp"); - ot->description = _("Add a lamp object to the scene"); + ot->name= "Add Lamp"; + ot->description = "Add a lamp object to the scene"; ot->idname= "OBJECT_OT_lamp_add"; /* api callbacks */ @@ -737,7 +735,7 @@ void OBJECT_OT_lamp_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(lamp_type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", lamp_type_items, 0, "Type", ""); ED_object_add_generic_props(ot, FALSE); } @@ -835,8 +833,8 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Add Group Instance"); - ot->description = _("Add a dupligroup instance"); + ot->name= "Add Group Instance"; + ot->description = "Add a dupligroup instance"; ot->idname= "OBJECT_OT_group_instance_add"; /* api callbacks */ @@ -849,7 +847,7 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, _("Group"), ""); + prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); RNA_def_enum_funcs(prop, RNA_group_itemf); ot->prop= prop; ED_object_add_generic_props(ot, FALSE); @@ -900,8 +898,8 @@ static int object_delete_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); - ot->description = _("Delete selected objects"); + ot->name= "Delete"; + ot->description = "Delete selected objects"; ot->idname= "OBJECT_OT_delete"; /* api callbacks */ @@ -1080,8 +1078,8 @@ void OBJECT_OT_duplicates_make_real(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Duplicates Real"); - ot->description = _("Make dupli objects attached to this object real"); + ot->name= "Make Duplicates Real"; + ot->description = "Make dupli objects attached to this object real"; ot->idname= "OBJECT_OT_duplicates_make_real"; /* api callbacks */ @@ -1096,8 +1094,8 @@ void OBJECT_OT_duplicates_make_real(wmOperatorType *ot) /**************************** Convert **************************/ static EnumPropertyItem convert_target_items[]= { - {OB_CURVE, "CURVE", ICON_OUTLINER_OB_CURVE, N_("Curve from Mesh/Text"), ""}, - {OB_MESH, "MESH", ICON_OUTLINER_OB_MESH, N_("Mesh from Curve/Meta/Surf/Text"), ""}, + {OB_CURVE, "CURVE", ICON_OUTLINER_OB_CURVE, "Curve from Mesh/Text", ""}, + {OB_MESH, "MESH", ICON_OUTLINER_OB_MESH, "Mesh from Curve/Meta/Surf/Text", ""}, {0, NULL, 0, NULL, NULL}}; static void curvetomesh(Scene *scene, Object *ob) @@ -1445,8 +1443,8 @@ static int convert_exec(bContext *C, wmOperator *op) void OBJECT_OT_convert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Convert to"); - ot->description = _("Convert selected objects to another type"); + ot->name= "Convert to"; + ot->description = "Convert selected objects to another type"; ot->idname= "OBJECT_OT_convert"; /* api callbacks */ @@ -1458,8 +1456,8 @@ void OBJECT_OT_convert(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "target", RNA_enum_items_gettexted(convert_target_items), OB_MESH, _("Target"), _("Type of object to convert to")); - RNA_def_boolean(ot->srna, "keep_original", 0, _("Keep Original"), _("Keep original objects instead of replacing them")); + ot->prop= RNA_def_enum(ot->srna, "target", convert_target_items, OB_MESH, "Target", "Type of object to convert to"); + RNA_def_boolean(ot->srna, "keep_original", 0, "Keep Original", "Keep original objects instead of replacing them"); } /**************************** Duplicate ************************/ @@ -1759,8 +1757,8 @@ void OBJECT_OT_duplicate(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Duplicate Objects"); - ot->description = _("Duplicate selected objects"); + ot->name= "Duplicate Objects"; + ot->description = "Duplicate selected objects"; ot->idname= "OBJECT_OT_duplicate"; /* api callbacks */ @@ -1771,8 +1769,8 @@ void OBJECT_OT_duplicate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_boolean(ot->srna, "linked", 0, _("Linked"), _("Duplicate object but not object data, linking to the original data")); - prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data"); + prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); RNA_def_property_flag(prop, PROP_HIDDEN); } @@ -1830,8 +1828,8 @@ static int add_named_exec(bContext *C, wmOperator *op) void OBJECT_OT_add_named(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Named Object"); - ot->description = _("Add named object"); + ot->name= "Add Named Object"; + ot->description = "Add named object"; ot->idname= "OBJECT_OT_add_named"; /* api callbacks */ @@ -1841,8 +1839,8 @@ void OBJECT_OT_add_named(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "linked", 0, _("Linked"), _("Duplicate object but not object data, linking to the original data")); - RNA_def_string(ot->srna, "name", "Cube", 24, _("Name"), _("Object name to add")); + RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data"); + RNA_def_string(ot->srna, "name", "Cube", 24, "Name", "Object name to add"); } @@ -1888,8 +1886,8 @@ static int join_exec(bContext *C, wmOperator *op) void OBJECT_OT_join(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Join"); - ot->description = _("Join selected objects into active object"); + ot->name= "Join"; + ot->description = "Join selected objects into active object"; ot->idname= "OBJECT_OT_join"; /* api callbacks */ @@ -1937,8 +1935,8 @@ static int join_shapes_exec(bContext *C, wmOperator *op) void OBJECT_OT_join_shapes(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Join as Shapes"); - ot->description = _("Merge selected objects to shapes of active object"); + ot->name= "Join as Shapes"; + ot->description = "Merge selected objects to shapes of active object"; ot->idname= "OBJECT_OT_join_shapes"; /* api callbacks */ diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 5a30c099592..66db7db5171 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -42,8 +42,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_constraint_types.h" #include "DNA_curve_types.h" #include "DNA_scene_types.h" @@ -486,8 +484,8 @@ void object_test_constraints (Object *owner) #define EDIT_CONSTRAINT_OWNER_BONE 1 static EnumPropertyItem constraint_owner_items[] = { - {EDIT_CONSTRAINT_OWNER_OBJECT, "OBJECT", 0, N_("Object"), N_("Edit a constraint on the active object")}, - {EDIT_CONSTRAINT_OWNER_BONE, "BONE", 0, N_("Bone"), N_("Edit a constraint on the active bone")}, + {EDIT_CONSTRAINT_OWNER_OBJECT, "OBJECT", 0, "Object", "Edit a constraint on the active object"}, + {EDIT_CONSTRAINT_OWNER_BONE, "BONE", 0, "Bone", "Edit a constraint on the active bone"}, {0, NULL, 0, NULL, NULL}}; @@ -509,8 +507,8 @@ static int edit_constraint_poll(bContext *C) static void edit_constraint_properties(wmOperatorType *ot) { - RNA_def_string(ot->srna, "constraint", "", 32, _("Constraint"), _("Name of the constraint to edit")); - RNA_def_enum(ot->srna, "owner", RNA_enum_items_gettexted(constraint_owner_items), 0, _("Owner"), _("The owner of this constraint")); + RNA_def_string(ot->srna, "constraint", "", 32, "Constraint", "Name of the constraint to edit"); + RNA_def_enum(ot->srna, "owner", constraint_owner_items, 0, "Owner", "The owner of this constraint"); } static int edit_constraint_invoke_properties(bContext *C, wmOperator *op) @@ -612,9 +610,9 @@ static int stretchto_reset_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void CONSTRAINT_OT_stretchto_reset (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset Original Length"); + ot->name= "Reset Original Length"; ot->idname= "CONSTRAINT_OT_stretchto_reset"; - ot->description= _("Reset original length of bone for Stretch To Constraint"); + ot->description= "Reset original length of bone for Stretch To Constraint"; ot->exec= stretchto_reset_exec; ot->invoke= stretchto_reset_invoke; @@ -655,9 +653,9 @@ static int limitdistance_reset_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void CONSTRAINT_OT_limitdistance_reset (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset Distance"); + ot->name= "Reset Distance"; ot->idname= "CONSTRAINT_OT_limitdistance_reset"; - ot->description= _("Reset limiting distance for Limit Distance Constraint"); + ot->description= "Reset limiting distance for Limit Distance Constraint"; ot->exec= limitdistance_reset_exec; ot->invoke= limitdistance_reset_invoke; @@ -745,9 +743,9 @@ static int childof_set_inverse_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void CONSTRAINT_OT_childof_set_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Inverse"); + ot->name= "Set Inverse"; ot->idname= "CONSTRAINT_OT_childof_set_inverse"; - ot->description= _("Set inverse correction for ChildOf constraint"); + ot->description= "Set inverse correction for ChildOf constraint"; ot->exec= childof_set_inverse_exec; ot->invoke= childof_set_inverse_invoke; @@ -789,9 +787,9 @@ static int childof_clear_inverse_invoke(bContext *C, wmOperator *op, wmEvent *UN void CONSTRAINT_OT_childof_clear_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Inverse"); + ot->name= "Clear Inverse"; ot->idname= "CONSTRAINT_OT_childof_clear_inverse"; - ot->description= _("Clear inverse correction for ChildOf constraint"); + ot->description= "Clear inverse correction for ChildOf constraint"; ot->exec= childof_clear_inverse_exec; ot->invoke= childof_clear_inverse_invoke; @@ -875,9 +873,9 @@ static int constraint_delete_exec (bContext *C, wmOperator *UNUSED(op)) void CONSTRAINT_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Constraint"); + ot->name= "Delete Constraint"; ot->idname= "CONSTRAINT_OT_delete"; - ot->description= _("Remove constraint from constraint stack"); + ot->description= "Remove constraint from constraint stack"; /* callbacks */ ot->exec= constraint_delete_exec; @@ -920,9 +918,9 @@ static int constraint_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNU void CONSTRAINT_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Constraint Down"); + ot->name= "Move Constraint Down"; ot->idname= "CONSTRAINT_OT_move_down"; - ot->description= _("Move constraint down in constraint stack"); + ot->description= "Move constraint down in constraint stack"; /* callbacks */ ot->exec= constraint_move_down_exec; @@ -967,9 +965,9 @@ static int constraint_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void CONSTRAINT_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Constraint Up"); + ot->name= "Move Constraint Up"; ot->idname= "CONSTRAINT_OT_move_up"; - ot->description= _("Move constraint up in constraint stack"); + ot->description= "Move constraint up in constraint stack"; /* callbacks */ ot->exec= constraint_move_up_exec; @@ -1014,9 +1012,9 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_constraints_clear(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Clear Pose Constraints"); + ot->name = "Clear Pose Constraints"; ot->idname= "POSE_OT_constraints_clear"; - ot->description= _("Clear all the constraints for the selected bones"); + ot->description= "Clear all the constraints for the selected bones"; /* callbacks */ ot->exec= pose_constraints_clear_exec; @@ -1049,9 +1047,9 @@ static int object_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_constraints_clear(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Clear Object Constraints"); + ot->name = "Clear Object Constraints"; ot->idname= "OBJECT_OT_constraints_clear"; - ot->description= _("Clear all the constraints for the active Object only"); + ot->description= "Clear all the constraints for the active Object only"; /* callbacks */ ot->exec= object_constraints_clear_exec; @@ -1095,9 +1093,9 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op) void POSE_OT_constraints_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Constraints to Selected"); + ot->name= "Copy Constraints to Selected"; ot->idname= "POSE_OT_constraints_copy"; - ot->description = _("Copy constraints to other selected bones."); + ot->description = "Copy constraints to other selected bones."; /* api callbacks */ ot->exec= pose_constraint_copy_exec; @@ -1136,9 +1134,9 @@ static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_constraints_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Constraints to Selected"); + ot->name= "Copy Constraints to Selected"; ot->idname= "OBJECT_OT_constraints_copy"; - ot->description = _("Copy constraints to other selected objects."); + ot->description = "Copy constraints to other selected objects."; /* api callbacks */ ot->exec= object_constraint_copy_exec; @@ -1448,8 +1446,8 @@ static int pose_constraint_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_constraint_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Constraint"); - ot->description = _("Add a constraint to the active object"); + ot->name= "Add Constraint"; + ot->description = "Add a constraint to the active object"; ot->idname= "OBJECT_OT_constraint_add"; /* api callbacks */ @@ -1461,14 +1459,14 @@ void OBJECT_OT_constraint_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(constraint_type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Constraint (with Targets)"); - ot->description = _("Add a constraint to the active object, with target (where applicable) set to the selected Objects/Bones"); + ot->name= "Add Constraint (with Targets)"; + ot->description = "Add a constraint to the active object, with target (where applicable) set to the selected Objects/Bones"; ot->idname= "OBJECT_OT_constraint_add_with_targets"; /* api callbacks */ @@ -1480,14 +1478,14 @@ void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } void POSE_OT_constraint_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Constraint"); - ot->description = _("Add a constraint to the active bone"); + ot->name= "Add Constraint"; + ot->description = "Add a constraint to the active bone"; ot->idname= "POSE_OT_constraint_add"; /* api callbacks */ @@ -1499,14 +1497,14 @@ void POSE_OT_constraint_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } void POSE_OT_constraint_add_with_targets(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Constraint (with Targets)"); - ot->description = _("Add a constraint to the active bone, with target (where applicable) set to the selected Objects/Bones"); + ot->name= "Add Constraint (with Targets)"; + ot->description = "Add a constraint to the active bone, with target (where applicable) set to the selected Objects/Bones"; ot->idname= "POSE_OT_constraint_add_with_targets"; /* api callbacks */ @@ -1518,7 +1516,7 @@ void POSE_OT_constraint_add_with_targets(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); } /************************ IK Constraint operators *********************/ @@ -1591,8 +1589,8 @@ static int pose_ik_add_exec(bContext *C, wmOperator *op) void POSE_OT_ik_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add IK to Bone"); - ot->description= _("Add IK Constraint to the active Bone"); + ot->name= "Add IK to Bone"; + ot->description= "Add IK Constraint to the active Bone"; ot->idname= "POSE_OT_ik_add"; /* api callbacks */ @@ -1604,7 +1602,7 @@ void POSE_OT_ik_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "with_targets", 1, _("With Targets"), _("Assign IK Constraint with targets derived from the select bones/objects")); + RNA_def_boolean(ot->srna, "with_targets", 1, "With Targets", "Assign IK Constraint with targets derived from the select bones/objects"); } /* ------------------ */ @@ -1642,8 +1640,8 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_ik_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove IK"); - ot->description= _("Remove all IK Constraints from selected bones"); + ot->name= "Remove IK"; + ot->description= "Remove all IK Constraints from selected bones"; ot->idname= "POSE_OT_ik_clear"; /* api callbacks */ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 355f55e3546..79cbfb6574b 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -46,8 +46,6 @@ #include "BLI_ghash.h" #include "BLI_rand.h" -#include "BLF_api.h" - #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_group_types.h" @@ -160,8 +158,8 @@ void OBJECT_OT_hide_view_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Restrict View"); - ot->description = _("Reveal the object by setting the hide flag"); + ot->name= "Clear Restrict View"; + ot->description = "Reveal the object by setting the hide flag"; ot->idname= "OBJECT_OT_hide_view_clear"; /* api callbacks */ @@ -213,8 +211,8 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_hide_view_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Restrict View"); - ot->description = _("Hide the object by setting the hide flag"); + ot->name= "Set Restrict View"; + ot->description = "Hide the object by setting the hide flag"; ot->idname= "OBJECT_OT_hide_view_set"; /* api callbacks */ @@ -224,7 +222,7 @@ void OBJECT_OT_hide_view_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected objects.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects."); } @@ -252,8 +250,8 @@ void OBJECT_OT_hide_render_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Restrict Render"); - ot->description = _("Reveal the render object by setting the hide render flag"); + ot->name= "Clear Restrict Render"; + ot->description = "Reveal the render object by setting the hide render flag"; ot->idname= "OBJECT_OT_hide_render_clear"; /* api callbacks */ @@ -288,8 +286,8 @@ static int object_hide_render_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_hide_render_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Restrict Render"); - ot->description = _("Hide the render object by setting the hide render flag"); + ot->name= "Set Restrict Render"; + ot->description = "Hide the render object by setting the hide render flag"; ot->idname= "OBJECT_OT_hide_render_set"; /* api callbacks */ @@ -299,7 +297,7 @@ void OBJECT_OT_hide_render_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected objects.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects."); } /* ******************* toggle editmode operator ***************** */ @@ -547,8 +545,8 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Editmode"); - ot->description = _("Toggle object's editmode"); + ot->name= "Toggle Editmode"; + ot->description = "Toggle object's editmode"; ot->idname= "OBJECT_OT_editmode_toggle"; /* api callbacks */ @@ -585,9 +583,9 @@ static int posemode_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_posemode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Pose Mode"); + ot->name= "Toggle Pose Mode"; ot->idname= "OBJECT_OT_posemode_toggle"; - ot->description= _("Enables or disables posing/selecting bones"); + ot->description= "Enables or disables posing/selecting bones"; /* api callbacks */ ot->exec= posemode_exec; @@ -1422,8 +1420,8 @@ void OBJECT_OT_forcefield_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Force Field"); - ot->description = _("Toggle object's force field"); + ot->name= "Toggle Force Field"; + ot->description = "Toggle object's force field"; ot->idname= "OBJECT_OT_forcefield_toggle"; /* api callbacks */ @@ -1488,9 +1486,9 @@ static int object_calculate_paths_exec (bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_paths_calculate (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Calculate Object Paths"); + ot->name= "Calculate Object Paths"; ot->idname= "OBJECT_OT_paths_calculate"; - ot->description= _("Calculate paths for the selected bones"); + ot->description= "Calculate paths for the selected bones"; /* api callbacks */ ot->exec= object_calculate_paths_exec; @@ -1532,9 +1530,9 @@ static int object_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_paths_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Object Paths"); + ot->name= "Clear Object Paths"; ot->idname= "OBJECT_OT_paths_clear"; - ot->description= _("Clear path caches for selected bones"); + ot->description= "Clear path caches for selected bones"; /* api callbacks */ ot->exec= object_clear_paths_exec; @@ -1591,8 +1589,8 @@ static int shade_poll(bContext *C) void OBJECT_OT_shade_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shade Flat"); - ot->description= _("Display faces 'flat'"); + ot->name= "Shade Flat"; + ot->description= "Display faces 'flat'"; ot->idname= "OBJECT_OT_shade_flat"; /* api callbacks */ @@ -1606,8 +1604,8 @@ void OBJECT_OT_shade_flat(wmOperatorType *ot) void OBJECT_OT_shade_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Shade Smooth"); - ot->description= _("Display faces 'smooth' (using vertex normals)"); + ot->name= "Shade Smooth"; + ot->description= "Display faces 'smooth' (using vertex normals)"; ot->idname= "OBJECT_OT_shade_smooth"; /* api callbacks */ @@ -1897,8 +1895,8 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Set Object Mode"); - ot->description = _("Sets the object interaction mode"); + ot->name= "Set Object Mode"; + ot->description = "Sets the object interaction mode"; ot->idname= "OBJECT_OT_mode_set"; /* api callbacks */ @@ -1909,10 +1907,10 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) /* flags */ ot->flag= 0; /* no register/undo here, leave it to operators being called */ - prop= RNA_def_enum(ot->srna, "mode", object_mode_items, OB_MODE_OBJECT, _("Mode"), ""); + prop= RNA_def_enum(ot->srna, "mode", object_mode_items, OB_MODE_OBJECT, "Mode", ""); RNA_def_enum_funcs(prop, object_mode_set_itemsf); - RNA_def_boolean(ot->srna, "toggle", 0, _("Toggle"), ""); + RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", ""); } @@ -1957,8 +1955,8 @@ static int game_property_new(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_game_property_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Game Property"); - ot->description= _("Create a new property available to the game engine"); + ot->name= "New Game Property"; + ot->description= "Create a new property available to the game engine"; ot->idname= "OBJECT_OT_game_property_new"; /* api callbacks */ @@ -1995,8 +1993,8 @@ static int game_property_remove(bContext *C, wmOperator *op) void OBJECT_OT_game_property_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Game Property"); - ot->description= _("Remove game property"); + ot->name= "Remove Game Property"; + ot->description= "Remove game property"; ot->idname= "OBJECT_OT_game_property_remove"; /* api callbacks */ @@ -2006,7 +2004,7 @@ void OBJECT_OT_game_property_remove(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), _("Property index to remove "), 0, INT_MAX); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Property index to remove ", 0, INT_MAX); } #define COPY_PROPERTIES_REPLACE 1 @@ -2014,9 +2012,9 @@ void OBJECT_OT_game_property_remove(wmOperatorType *ot) #define COPY_PROPERTIES_COPY 3 static EnumPropertyItem game_properties_copy_operations[] ={ - {COPY_PROPERTIES_REPLACE, "REPLACE", 0, N_("Replace Properties"), ""}, - {COPY_PROPERTIES_MERGE, "MERGE", 0, N_("Merge Properties"), ""}, - {COPY_PROPERTIES_COPY, "COPY", 0, N_("Copy a Property"), ""}, + {COPY_PROPERTIES_REPLACE, "REPLACE", 0, "Replace Properties", ""}, + {COPY_PROPERTIES_MERGE, "MERGE", 0, "Merge Properties", ""}, + {COPY_PROPERTIES_COPY, "COPY", 0, "Copy a Property", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem gameprops_items[]= { @@ -2092,7 +2090,7 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= _("Copy Game Property"); + ot->name= "Copy Game Property"; ot->idname= "OBJECT_OT_game_property_copy"; /* api callbacks */ @@ -2102,8 +2100,8 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, _("Operation"), ""); - prop=RNA_def_enum(ot->srna, "property", gameprops_items, 0, _("Property"), _("Properties to copy")); + RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, "Operation", ""); + prop=RNA_def_enum(ot->srna, "property", gameprops_items, 0, "Property", "Properties to copy"); RNA_def_enum_funcs(prop, gameprops_itemf); ot->prop=prop; } @@ -2121,7 +2119,7 @@ static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_game_property_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Game Property"); + ot->name= "Clear Game Property"; ot->idname= "OBJECT_OT_game_property_clear"; /* api callbacks */ @@ -2178,8 +2176,8 @@ static int logicbricks_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_logic_bricks_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Logic Bricks to Selected"); - ot->description = _("Copy logic bricks to other selected objects."); + ot->name= "Copy Logic Bricks to Selected"; + ot->description = "Copy logic bricks to other selected objects."; ot->idname= "OBJECT_OT_logic_bricks_copy"; /* api callbacks */ diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 374f2ff918d..b1ab68ff087 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -37,8 +37,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_group_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -97,8 +95,8 @@ static int objects_add_active_exec(bContext *C, wmOperator *op) void GROUP_OT_objects_add_active(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Selected To Active Group"); - ot->description = _("Add the object to an object group that contains the active object"); + ot->name= "Add Selected To Active Group"; + ot->description = "Add the object to an object group that contains the active object"; ot->idname= "GROUP_OT_objects_add_active"; /* api callbacks */ @@ -144,8 +142,8 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op) void GROUP_OT_objects_remove_active(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Selected From Active Group"); - ot->description = _("Remove the object from an object group that contains the active object"); + ot->name= "Remove Selected From Active Group"; + ot->description = "Remove the object from an object group that contains the active object"; ot->idname= "GROUP_OT_objects_remove_active"; /* api callbacks */ @@ -178,8 +176,8 @@ static int group_objects_remove_exec(bContext *C, wmOperator *UNUSED(op)) void GROUP_OT_objects_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove From Groups"); - ot->description = _("Remove selected objects from all groups"); + ot->name= "Remove From Groups"; + ot->description = "Remove selected objects from all groups"; ot->idname= "GROUP_OT_objects_remove"; /* api callbacks */ @@ -215,8 +213,8 @@ static int group_create_exec(bContext *C, wmOperator *op) void GROUP_OT_create(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Create New Group"); - ot->description = _("Create an object group from selected objects"); + ot->name= "Create New Group"; + ot->description = "Create an object group from selected objects"; ot->idname= "GROUP_OT_create"; /* api callbacks */ @@ -226,7 +224,7 @@ void GROUP_OT_create(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "name", "Group", 32, _("Name"), _("Name of the new group")); + RNA_def_string(ot->srna, "name", "Group", 32, "Name", "Name of the new group"); } /****************** properties window operators *********************/ @@ -251,9 +249,9 @@ static int group_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_group_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add to Group"); + ot->name= "Add to Group"; ot->idname= "OBJECT_OT_group_add"; - ot->description = _("Add an object to a new group"); + ot->description = "Add an object to a new group"; /* api callbacks */ ot->exec= group_add_exec; @@ -283,9 +281,9 @@ void OBJECT_OT_group_link(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Link to Group"); + ot->name= "Link to Group"; ot->idname= "OBJECT_OT_group_link"; - ot->description = _("Add an object to an existing group"); + ot->description = "Add an object to an existing group"; /* api callbacks */ ot->exec= group_link_exec; @@ -295,7 +293,7 @@ void OBJECT_OT_group_link(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, _("Group"), ""); + prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); RNA_def_enum_funcs(prop, RNA_group_local_itemf); ot->prop= prop; } @@ -319,7 +317,7 @@ static int group_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_group_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Group"); + ot->name= "Remove Group"; ot->idname= "OBJECT_OT_group_remove"; /* api callbacks */ diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 688e1209750..14ce223db5e 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -39,8 +39,6 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" @@ -243,8 +241,8 @@ static int select_all_exec(bContext *C, wmOperator *op) void LATTICE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); - ot->description= _("Change selection of all UVW control points"); + ot->name= "Select or Deselect All"; + ot->description= "Change selection of all UVW control points"; ot->idname= "LATTICE_OT_select_all"; /* api callbacks */ @@ -291,8 +289,8 @@ static int make_regular_exec(bContext *C, wmOperator *UNUSED(op)) void LATTICE_OT_make_regular(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Regular"); - ot->description= _("Set UVW control points a uniform distance apart"); + ot->name= "Make Regular"; + ot->description= "Set UVW control points a uniform distance apart"; ot->idname= "LATTICE_OT_make_regular"; /* api callbacks */ diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 2daf4a542c4..8813b0027cd 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -50,8 +50,6 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_curve.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -645,8 +643,8 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Add Modifier"); - ot->description = _("Add a modifier to the active object"); + ot->name= "Add Modifier"; + ot->description = "Add a modifier to the active object"; ot->idname= "OBJECT_OT_modifier_add"; /* api callbacks */ @@ -658,7 +656,7 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(modifier_type_items), eModifierType_Subsurf, "Type", ""); + prop= RNA_def_enum(ot->srna, "type", modifier_type_items, eModifierType_Subsurf, "Type", ""); RNA_def_enum_funcs(prop, modifier_add_itemf); ot->prop= prop; } @@ -752,8 +750,8 @@ static int modifier_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_modifier_remove(wmOperatorType *ot) { - ot->name= _("Remove Modifier"); - ot->description= _("Remove a modifier from the active object"); + ot->name= "Remove Modifier"; + ot->description= "Remove a modifier from the active object"; ot->idname= "OBJECT_OT_modifier_remove"; ot->invoke= modifier_remove_invoke; @@ -791,8 +789,8 @@ static int modifier_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_modifier_move_up(wmOperatorType *ot) { - ot->name= _("Move Up Modifier"); - ot->description= _("Move modifier up in the stack"); + ot->name= "Move Up Modifier"; + ot->description= "Move modifier up in the stack"; ot->idname= "OBJECT_OT_modifier_move_up"; ot->invoke= modifier_move_up_invoke; @@ -830,8 +828,8 @@ static int modifier_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void OBJECT_OT_modifier_move_down(wmOperatorType *ot) { - ot->name= _("Move Down Modifier"); - ot->description= _("Move modifier down in the stack"); + ot->name= "Move Down Modifier"; + ot->description= "Move modifier down in the stack"; ot->idname= "OBJECT_OT_modifier_move_down"; ot->invoke= modifier_move_down_invoke; @@ -871,14 +869,14 @@ static int modifier_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev } static EnumPropertyItem modifier_apply_as_items[] = { - {MODIFIER_APPLY_DATA, "DATA", 0, N_("Object Data"), N_("Apply modifier to the object's data")}, - {MODIFIER_APPLY_SHAPE, "SHAPE", 0, N_("New Shape"), N_("Apply deform-only modifier to a new shape on this object")}, + {MODIFIER_APPLY_DATA, "DATA", 0, "Object Data", "Apply modifier to the object's data"}, + {MODIFIER_APPLY_SHAPE, "SHAPE", 0, "New Shape", "Apply deform-only modifier to a new shape on this object"}, {0, NULL, 0, NULL, NULL}}; void OBJECT_OT_modifier_apply(wmOperatorType *ot) { - ot->name= _("Apply Modifier"); - ot->description= _("Apply modifier and remove from the stack"); + ot->name= "Apply Modifier"; + ot->description= "Apply modifier and remove from the stack"; ot->idname= "OBJECT_OT_modifier_apply"; ot->invoke= modifier_apply_invoke; @@ -888,7 +886,7 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "apply_as", RNA_enum_items_gettexted(modifier_apply_as_items), MODIFIER_APPLY_DATA, _("Apply as"), _("How to apply the modifier to the geometry")); + RNA_def_enum(ot->srna, "apply_as", modifier_apply_as_items, MODIFIER_APPLY_DATA, "Apply as", "How to apply the modifier to the geometry"); edit_modifier_properties(ot); } @@ -920,8 +918,8 @@ static int modifier_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_modifier_convert(wmOperatorType *ot) { - ot->name= _("Convert Modifier"); - ot->description= _("Convert particles to a mesh object"); + ot->name= "Convert Modifier"; + ot->description= "Convert particles to a mesh object"; ot->idname= "OBJECT_OT_modifier_convert"; ot->invoke= modifier_convert_invoke; @@ -959,8 +957,8 @@ static int modifier_copy_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void OBJECT_OT_modifier_copy(wmOperatorType *ot) { - ot->name= _("Copy Modifier"); - ot->description= _("Duplicate modifier at the same position in the stack"); + ot->name= "Copy Modifier"; + ot->description= "Duplicate modifier at the same position in the stack"; ot->idname= "OBJECT_OT_modifier_copy"; ot->invoke= modifier_copy_invoke; @@ -1004,8 +1002,8 @@ static int multires_higher_levels_delete_invoke(bContext *C, wmOperator *op, wmE void OBJECT_OT_multires_higher_levels_delete(wmOperatorType *ot) { - ot->name= _("Delete Higher Levels"); - ot->description= _("Deletes the higher resolution mesh, potential loss of detail"); + ot->name= "Delete Higher Levels"; + ot->description= "Deletes the higher resolution mesh, potential loss of detail"; ot->idname= "OBJECT_OT_multires_higher_levels_delete"; ot->poll= multires_poll; @@ -1045,8 +1043,8 @@ static int multires_subdivide_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void OBJECT_OT_multires_subdivide(wmOperatorType *ot) { - ot->name= _("Multires Subdivide"); - ot->description= _("Add a new level of subdivision"); + ot->name= "Multires Subdivide"; + ot->description= "Add a new level of subdivision"; ot->idname= "OBJECT_OT_multires_subdivide"; ot->poll= multires_poll; @@ -1108,8 +1106,8 @@ static int multires_reshape_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_multires_reshape(wmOperatorType *ot) { - ot->name= _("Multires Reshape"); - ot->description= _("Copy vertex coordinates from other object"); + ot->name= "Multires Reshape"; + ot->description= "Copy vertex coordinates from other object"; ot->idname= "OBJECT_OT_multires_reshape"; ot->poll= multires_poll; @@ -1183,8 +1181,8 @@ static int multires_external_save_invoke(bContext *C, wmOperator *op, wmEvent *U void OBJECT_OT_multires_external_save(wmOperatorType *ot) { - ot->name= _("Multires Save External"); - ot->description= _("Save displacements to an external file"); + ot->name= "Multires Save External"; + ot->description= "Save displacements to an external file"; ot->idname= "OBJECT_OT_multires_external_save"; // XXX modifier no longer in context after file browser .. ot->poll= multires_poll; @@ -1217,8 +1215,8 @@ static int multires_external_pack_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_multires_external_pack(wmOperatorType *ot) { - ot->name= _("Multires Pack External"); - ot->description= _("Pack displacements from an external file"); + ot->name= "Multires Pack External"; + ot->description= "Pack displacements from an external file"; ot->idname= "OBJECT_OT_multires_external_pack"; ot->poll= multires_poll; @@ -1256,8 +1254,8 @@ static int multires_base_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void OBJECT_OT_multires_base_apply(wmOperatorType *ot) { - ot->name= _("Multires Apply Base"); - ot->description= _("Modify the base mesh to conform to the displaced mesh"); + ot->name= "Multires Apply Base"; + ot->description= "Modify the base mesh to conform to the displaced mesh"; ot->idname= "OBJECT_OT_multires_base_apply"; ot->poll= multires_poll; @@ -1350,8 +1348,8 @@ static int meshdeform_bind_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_meshdeform_bind(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mesh Deform Bind"); - ot->description = _("Bind mesh to cage in mesh deform modifier"); + ot->name= "Mesh Deform Bind"; + ot->description = "Bind mesh to cage in mesh deform modifier"; ot->idname= "OBJECT_OT_meshdeform_bind"; /* api callbacks */ @@ -1398,8 +1396,8 @@ static int explode_refresh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_explode_refresh(wmOperatorType *ot) { - ot->name= _("Explode Refresh"); - ot->description= _("Refresh data in the Explode modifier"); + ot->name= "Explode Refresh"; + ot->description= "Refresh data in the Explode modifier"; ot->idname= "OBJECT_OT_explode_refresh"; ot->poll= explode_poll; diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 931be10a2a1..5eb17268d19 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -41,8 +41,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "RNA_access.h" @@ -228,7 +226,7 @@ void ED_operatormacros_object(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move", _("Duplicate Objects"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Duplicate Objects", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); @@ -236,7 +234,7 @@ void ED_operatormacros_object(void) } /* grr, should be able to pass options on... */ - ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move_linked", _("Duplicate Linked"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("OBJECT_OT_duplicate_move_linked", "Duplicate Linked", OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { otmacro= WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate"); RNA_boolean_set(otmacro->ptr, "linked", 1); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 944124beb17..4d7f6fa9e7a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -55,8 +55,6 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_armature.h" @@ -253,8 +251,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Vertex Parent"); - ot->description = _("Parent selected objects to the selected vertices"); + ot->name= "Make Vertex Parent"; + ot->description = "Parent selected objects to the selected vertices"; ot->idname= "OBJECT_OT_vertex_parent_set"; /* api callbacks */ @@ -393,9 +391,9 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Make Proxy"); + ot->name= "Make Proxy"; ot->idname= "OBJECT_OT_proxy_make"; - ot->description= _("Add empty object to become local replacement data of a library-linked object"); + ot->description= "Add empty object to become local replacement data of a library-linked object"; /* callbacks */ ot->invoke= make_proxy_invoke; @@ -406,8 +404,8 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "object", "", MAX_ID_NAME-2, _("Proxy Object"), _("Name of lib-linked/grouped object to make a proxy for.")); - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Type"), _("Group object")); /* XXX, relies on hard coded ID at the moment */ + RNA_def_string(ot->srna, "object", "", MAX_ID_NAME-2, "Proxy Object", "Name of lib-linked/grouped object to make a proxy for."); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Type", "Group object"); /* XXX, relies on hard coded ID at the moment */ RNA_def_enum_funcs(prop, proxy_group_object_itemf); ot->prop= prop; } @@ -415,9 +413,9 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) /********************** Clear Parent Operator ******************* */ static EnumPropertyItem prop_clear_parent_types[] = { - {0, "CLEAR", 0, N_("Clear Parent"), ""}, - {1, "CLEAR_KEEP_TRANSFORM", 0, N_("Clear and Keep Transformation"), ""}, - {2, "CLEAR_INVERSE", 0, N_("Clear Parent Inverse"), ""}, + {0, "CLEAR", 0, "Clear Parent", ""}, + {1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation", ""}, + {2, "CLEAR_INVERSE", 0, "Clear Parent Inverse", ""}, {0, NULL, 0, NULL, NULL} }; @@ -458,8 +456,8 @@ static int parent_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Parent"); - ot->description = _("Clear the object's parenting"); + ot->name= "Clear Parent"; + ot->description = "Clear the object's parenting"; ot->idname= "OBJECT_OT_parent_clear"; /* api callbacks */ @@ -471,7 +469,7 @@ void OBJECT_OT_parent_clear(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_clear_parent_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", ""); } /* ******************** Make Parent Operator *********************** */ @@ -490,18 +488,18 @@ void OBJECT_OT_parent_clear(wmOperatorType *ot) #define PAR_TRIA 11 static EnumPropertyItem prop_make_parent_types[] = { - {PAR_OBJECT, "OBJECT", 0, N_("Object"), ""}, - {PAR_ARMATURE, "ARMATURE", 0, N_("Armature Deform"), ""}, - {PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, N_(" With Empty Groups"), ""}, - {PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, N_(" With Automatic Weights"), ""}, - {PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, N_(" With Envelope Weights"), ""}, - {PAR_BONE, "BONE", 0, N_("Bone"), ""}, - {PAR_CURVE, "CURVE", 0, N_("Curve Deform"), ""}, - {PAR_FOLLOW, "FOLLOW", 0, N_("Follow Path"), ""}, - {PAR_PATH_CONST, "PATH_CONST", 0, N_("Path Constraint"), ""}, - {PAR_LATTICE, "LATTICE", 0, N_("Lattice Deform"), ""}, - {PAR_VERTEX, "VERTEX", 0, N_("Vertex"), ""}, - {PAR_TRIA, "TRIA", 0, N_("Triangle"), ""}, + {PAR_OBJECT, "OBJECT", 0, "Object", ""}, + {PAR_ARMATURE, "ARMATURE", 0, "Armature Deform", ""}, + {PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, " With Empty Groups", ""}, + {PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, " With Automatic Weights", ""}, + {PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, " With Envelope Weights", ""}, + {PAR_BONE, "BONE", 0, "Bone", ""}, + {PAR_CURVE, "CURVE", 0, "Curve Deform", ""}, + {PAR_FOLLOW, "FOLLOW", 0, "Follow Path", ""}, + {PAR_PATH_CONST, "PATH_CONST", 0, "Path Constraint", ""}, + {PAR_LATTICE, "LATTICE", 0, "Lattice Deform", ""}, + {PAR_VERTEX, "VERTEX", 0, "Vertex", ""}, + {PAR_TRIA, "TRIA", 0, "Triangle", ""}, {0, NULL, 0, NULL, NULL} }; @@ -731,8 +729,8 @@ static int parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSE void OBJECT_OT_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Parent"); - ot->description = _("Set the object's parenting"); + ot->name= "Make Parent"; + ot->description = "Set the object's parenting"; ot->idname= "OBJECT_OT_parent_set"; /* api callbacks */ @@ -744,7 +742,7 @@ void OBJECT_OT_parent_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_make_parent_types), 0, _("Type"), ""); + RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", ""); } /* ************ Make Parent Without Inverse Operator ******************* */ @@ -788,8 +786,8 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_parent_no_inverse_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Parent without Inverse"); - ot->description = _("Set the object's parenting without setting the inverse parent correction"); + ot->name= "Make Parent without Inverse"; + ot->description = "Set the object's parenting without setting the inverse parent correction"; ot->idname= "OBJECT_OT_parent_no_inverse_set"; /* api callbacks */ @@ -830,8 +828,8 @@ void OBJECT_OT_slow_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Slow Parent"); - ot->description = _("Clear the object's slow parent"); + ot->name= "Clear Slow Parent"; + ot->description = "Clear the object's slow parent"; ot->idname= "OBJECT_OT_slow_parent_clear"; /* api callbacks */ @@ -869,8 +867,8 @@ void OBJECT_OT_slow_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Slow Parent"); - ot->description = _("Set the object's slow parent"); + ot->name= "Set Slow Parent"; + ot->description = "Set the object's slow parent"; ot->idname= "OBJECT_OT_slow_parent_set"; /* api callbacks */ @@ -885,8 +883,8 @@ void OBJECT_OT_slow_parent_set(wmOperatorType *ot) /* ******************** Clear Track Operator ******************* */ static EnumPropertyItem prop_clear_track_types[] = { - {0, "CLEAR", 0, N_("Clear Track"), ""}, - {1, "CLEAR_KEEP_TRANSFORM", 0, N_("Clear and Keep Transformation (Clear Track)"), ""}, + {0, "CLEAR", 0, "Clear Track", ""}, + {1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""}, {0, NULL, 0, NULL, NULL} }; @@ -930,8 +928,8 @@ static int object_track_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_track_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear track"); - ot->description = _("Clear tracking constraint or flag from object"); + ot->name= "Clear track"; + ot->description = "Clear tracking constraint or flag from object"; ot->idname= "OBJECT_OT_track_clear"; /* api callbacks */ @@ -943,15 +941,15 @@ void OBJECT_OT_track_clear(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_clear_track_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", ""); } /************************** Make Track Operator *****************************/ static EnumPropertyItem prop_make_track_types[] = { - {1, "DAMPTRACK", 0, N_("Damped Track Constraint"), ""}, - {2, "TRACKTO", 0, N_("Track To Constraint"), ""}, - {3, "LOCKTRACK", 0, N_("Lock Track Constraint"), ""}, + {1, "DAMPTRACK", 0, "Damped Track Constraint", ""}, + {2, "TRACKTO", 0, "Track To Constraint", ""}, + {3, "LOCKTRACK", 0, "Lock Track Constraint", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1035,8 +1033,8 @@ static int track_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_track_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Track"); - ot->description = _("Make the object track another object, either by constraint or old way or locked track"); + ot->name= "Make Track"; + ot->description = "Make the object track another object, either by constraint or old way or locked track"; ot->idname= "OBJECT_OT_track_set"; /* api callbacks */ @@ -1049,7 +1047,7 @@ void OBJECT_OT_track_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_make_track_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", ""); } /************************** Move to Layer Operator *****************************/ @@ -1146,8 +1144,8 @@ static int move_to_layer_exec(bContext *C, wmOperator *op) void OBJECT_OT_move_to_layer(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move to Layer"); - ot->description = _("Move the object to different layers"); + ot->name= "Move to Layer"; + ot->description = "Move the object to different layers"; ot->idname= "OBJECT_OT_move_to_layer"; /* api callbacks */ @@ -1159,7 +1157,7 @@ void OBJECT_OT_move_to_layer(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, _("Layer"), ""); + RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", ""); } /************************** Link to Scene Operator *****************************/ @@ -1322,8 +1320,8 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Link Objects to Scene"); - ot->description = _("Link selection to another scene"); + ot->name= "Link Objects to Scene"; + ot->description = "Link selection to another scene"; ot->idname= "OBJECT_OT_make_links_scene"; /* api callbacks */ @@ -1335,7 +1333,7 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, _("Scene"), ""); + prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_local_itemf); ot->prop= prop; } @@ -1343,16 +1341,16 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) void OBJECT_OT_make_links_data(wmOperatorType *ot) { static EnumPropertyItem make_links_items[]= { - {MAKE_LINKS_OBDATA, "OBDATA", 0, N_("Object Data"), ""}, - {MAKE_LINKS_MATERIALS, "MATERIAL", 0, N_("Materials"), ""}, - {MAKE_LINKS_ANIMDATA, "ANIMATION", 0, N_("Animation Data"), ""}, - {MAKE_LINKS_DUPLIGROUP, "DUPLIGROUP", 0, N_("DupliGroup"), ""}, - {MAKE_LINKS_MODIFIERS, "MODIFIERS", 0, N_("Modifiers"), ""}, + {MAKE_LINKS_OBDATA, "OBDATA", 0, "Object Data", ""}, + {MAKE_LINKS_MATERIALS, "MATERIAL", 0, "Materials", ""}, + {MAKE_LINKS_ANIMDATA, "ANIMATION", 0, "Animation Data", ""}, + {MAKE_LINKS_DUPLIGROUP, "DUPLIGROUP", 0, "DupliGroup", ""}, + {MAKE_LINKS_MODIFIERS, "MODIFIERS", 0, "Modifiers", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Link Data"); - ot->description = _("Make links from the active object to other selected objects"); + ot->name= "Link Data"; + ot->description = "Make links from the active object to other selected objects"; ot->idname= "OBJECT_OT_make_links_data"; /* api callbacks */ @@ -1363,7 +1361,7 @@ void OBJECT_OT_make_links_data(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(make_links_items), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", make_links_items, 0, "Type", ""); } @@ -1804,14 +1802,14 @@ static int make_local_exec(bContext *C, wmOperator *op) void OBJECT_OT_make_local(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {1, "SELECTED_OBJECTS", 0, N_("Selected Objects"), ""}, - {2, "SELECTED_OBJECTS_DATA", 0, N_("Selected Objects and Data"), ""}, - {3, "ALL", 0, N_("All"), ""}, + {1, "SELECTED_OBJECTS", 0, "Selected Objects", ""}, + {2, "SELECTED_OBJECTS_DATA", 0, "Selected Objects and Data", ""}, + {3, "ALL", 0, "All", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Make Local"); - ot->description = _("Make library linked datablocks local to this file"); + ot->name= "Make Local"; + ot->description = "Make library linked datablocks local to this file"; ot->idname= "OBJECT_OT_make_local"; /* api callbacks */ @@ -1823,7 +1821,7 @@ void OBJECT_OT_make_local(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); } static int make_single_user_exec(bContext *C, wmOperator *op) @@ -1858,13 +1856,13 @@ static int make_single_user_exec(bContext *C, wmOperator *op) void OBJECT_OT_make_single_user(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {SELECT, "SELECTED_OBJECTS", 0, N_("Selected Objects"), ""}, - {0, "ALL", 0, N_("All"), ""}, + {SELECT, "SELECTED_OBJECTS", 0, "Selected Objects", ""}, + {0, "ALL", 0, "All", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Make Single User"); - ot->description = _("Make linked data local to each object"); + ot->name= "Make Single User"; + ot->description = "Make linked data local to each object"; ot->idname= "OBJECT_OT_make_single_user"; /* api callbacks */ @@ -1876,13 +1874,13 @@ void OBJECT_OT_make_single_user(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), SELECT, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, SELECT, "Type", ""); - RNA_def_boolean(ot->srna, "object", 0, _("Object"), _("Make single user objects")); - RNA_def_boolean(ot->srna, "obdata", 0, _("Object Data"), _("Make single user object data")); - RNA_def_boolean(ot->srna, "material", 0, _("Materials"), _("Make materials local to each datablock")); - RNA_def_boolean(ot->srna, "texture", 0, _("Textures"), _("Make textures local to each material")); - RNA_def_boolean(ot->srna, "animation", 0, _("Object Animation"), _("Make animation data local to each object")); + RNA_def_boolean(ot->srna, "object", 0, "Object", "Make single user objects"); + RNA_def_boolean(ot->srna, "obdata", 0, "Object Data", "Make single user object data"); + RNA_def_boolean(ot->srna, "material", 0, "Materials", "Make materials local to each datablock"); + RNA_def_boolean(ot->srna, "texture", 0, "Textures", "Make textures local to each material"); + RNA_def_boolean(ot->srna, "animation", 0, "Object Animation", "Make animation data local to each object"); } static int drop_named_material_invoke(bContext *C, wmOperator *op, wmEvent *event) @@ -1911,7 +1909,7 @@ void OBJECT_OT_drop_named_material(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Drop Named Material on Object"); + ot->name= "Drop Named Material on Object"; ot->description = ""; ot->idname= "OBJECT_OT_drop_named_material"; @@ -1923,5 +1921,5 @@ void OBJECT_OT_drop_named_material(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "name", "Material", 24, _("Name"), _("Material name to assign.")); + RNA_def_string(ot->srna, "name", "Material", 24, "Name", "Material name to assign."); } diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 1052fd0cf38..8fdd7a53e91 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -50,8 +50,6 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_group.h" #include "BKE_main.h" @@ -168,8 +166,8 @@ static int object_select_by_type_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_by_type(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select By Type"); - ot->description = _("Select all visible objects that are of a type"); + ot->name= "Select By Type"; + ot->description = "Select all visible objects that are of a type"; ot->idname= "OBJECT_OT_select_by_type"; /* api callbacks */ @@ -181,21 +179,21 @@ void OBJECT_OT_select_by_type(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(object_type_items), 1, _("Type"), ""); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); + ot->prop= RNA_def_enum(ot->srna, "type", object_type_items, 1, "Type", ""); } /*********************** Selection by Links *********************/ static EnumPropertyItem prop_select_linked_types[] = { //{1, "IPO", 0, "Object IPO", ""}, // XXX depreceated animation system stuff... - {2, "OBDATA", 0, N_("Object Data"), ""}, - {3, "MATERIAL", 0, N_("Material"), ""}, - {4, "TEXTURE", 0, N_("Texture"), ""}, - {5, "DUPGROUP", 0, N_("Dupligroup"), ""}, - {6, "PARTICLE", 0, N_("Particle System"), ""}, - {7, "LIBRARY", 0, N_("Library"), ""}, - {8, "LIBRARY_OBDATA", 0, N_("Library (Object Data)"), ""}, + {2, "OBDATA", 0, "Object Data", ""}, + {3, "MATERIAL", 0, "Material", ""}, + {4, "TEXTURE", 0, "Texture", ""}, + {5, "DUPGROUP", 0, "Dupligroup", ""}, + {6, "PARTICLE", 0, "Particle System", ""}, + {7, "LIBRARY", 0, "Library", ""}, + {8, "LIBRARY_OBDATA", 0, "Library (Object Data)", ""}, {0, NULL, 0, NULL, NULL} }; @@ -350,8 +348,8 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked"); - ot->description = _("Select all visible objects that are linked"); + ot->name= "Select Linked"; + ot->description = "Select all visible objects that are linked"; ot->idname= "OBJECT_OT_select_linked"; /* api callbacks */ @@ -363,24 +361,24 @@ void OBJECT_OT_select_linked(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_linked_types), 0, _("Type"), ""); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); + ot->prop= RNA_def_enum(ot->srna, "type", prop_select_linked_types, 0, "Type", ""); } /*********************** Selected Grouped ********************/ static EnumPropertyItem prop_select_grouped_types[] = { - {1, "CHILDREN_RECURSIVE", 0, N_("Children"), ""}, - {2, "CHILDREN", 0, N_("Immediate Children"), ""}, - {3, "PARENT", 0, N_("Parent"), ""}, - {4, "SIBLINGS", 0, N_("Siblings"), N_("Shared Parent")}, - {5, "TYPE", 0, N_("Type"), N_("Shared object type")}, - {6, "LAYER", 0, N_("Layer"), N_("Shared layers")}, - {7, "GROUP", 0, N_("Group"), N_("Shared group")}, - {8, "HOOK", 0, N_("Hook"), ""}, - {9, "PASS", 0, N_("Pass"), N_("Render pass Index")}, - {10, "COLOR", 0, N_("Color"), N_("Object Color")}, - {11, "PROPERTIES", 0, N_("Properties"), N_("Game Properties")}, + {1, "CHILDREN_RECURSIVE", 0, "Children", ""}, + {2, "CHILDREN", 0, "Immediate Children", ""}, + {3, "PARENT", 0, "Parent", ""}, + {4, "SIBLINGS", 0, "Siblings", "Shared Parent"}, + {5, "TYPE", 0, "Type", "Shared object type"}, + {6, "LAYER", 0, "Layer", "Shared layers"}, + {7, "GROUP", 0, "Group", "Shared group"}, + {8, "HOOK", 0, "Hook", ""}, + {9, "PASS", 0, "Pass", "Render pass Index"}, + {10, "COLOR", 0, "Color", "Object Color"}, + {11, "PROPERTIES", 0, "Properties", "Game Properties"}, {12, "KEYINGSET", 0, "Keying Set", "Objects included in active Keying Set"}, {0, NULL, 0, NULL, NULL} }; @@ -676,8 +674,8 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_grouped(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Grouped"); - ot->description = _("Select all visible objects grouped by various properties"); + ot->name= "Select Grouped"; + ot->description = "Select all visible objects grouped by various properties"; ot->idname= "OBJECT_OT_select_grouped"; /* api callbacks */ @@ -689,8 +687,8 @@ void OBJECT_OT_select_grouped(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_grouped_types), 0, _("Type"), ""); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); + ot->prop= RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); } /************************* Select by Layer **********************/ @@ -725,8 +723,8 @@ static int object_select_by_layer_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_by_layer(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select by Layer"); - ot->description = _("Select all visible objects on a layer"); + ot->name= "Select by Layer"; + ot->description = "Select all visible objects on a layer"; ot->idname= "OBJECT_OT_select_by_layer"; /* api callbacks */ @@ -738,8 +736,8 @@ void OBJECT_OT_select_by_layer(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - RNA_def_int(ot->srna, "layers", 1, 1, 20, _("Layer"), "", 1, 20); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first."); + RNA_def_int(ot->srna, "layers", 1, 1, 20, "Layer", "", 1, 20); } /************************** Select Inverse *************************/ @@ -764,8 +762,8 @@ void OBJECT_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); - ot->description = _("Invert selection of all visible objects"); + ot->name= "Select Inverse"; + ot->description = "Invert selection of all visible objects"; ot->idname= "OBJECT_OT_select_inverse"; /* api callbacks */ @@ -825,8 +823,8 @@ void OBJECT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); - ot->description = _("Change selection of all visible objects in scene"); + ot->name= "Select or Deselect All"; + ot->description = "Change selection of all visible objects in scene"; ot->idname= "OBJECT_OT_select_all"; /* api callbacks */ @@ -874,8 +872,8 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Same Group"); - ot->description = _("Select object in the same group"); + ot->name= "Select Same Group"; + ot->description = "Select object in the same group"; ot->idname= "OBJECT_OT_select_same_group"; /* api callbacks */ @@ -885,7 +883,7 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "group", "", 32, _("Group"), _("Name of the group to select.")); + RNA_def_string(ot->srna, "group", "", 32, "Group", "Name of the group to select."); } /**************************** Select Mirror ****************************/ @@ -927,8 +925,8 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Mirror"); - ot->description = _("Select the Mirror objects of the selected object eg. L.sword -> R.sword"); + ot->name= "Select Mirror"; + ot->description = "Select the Mirror objects of the selected object eg. L.sword -> R.sword"; ot->idname= "OBJECT_OT_select_mirror"; /* api callbacks */ @@ -938,7 +936,7 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend selection instead of deselecting everything first.")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first."); } @@ -984,8 +982,8 @@ void OBJECT_OT_select_name(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Name"); - ot->description = _("Select an object with this name"); + ot->name= "Select Name"; + ot->description = "Select an object with this name"; ot->idname= "OBJECT_OT_select_name"; /* api callbacks */ @@ -995,8 +993,8 @@ void OBJECT_OT_select_name(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "name", "", 0, _("Name"), _("Object name to select.")); - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend selection instead of deselecting everything first.")); + RNA_def_string(ot->srna, "name", "", 0, "Name", "Object name to select."); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first."); } /**************************** Select Random ****************************/ @@ -1031,8 +1029,8 @@ static int object_select_random_exec(bContext *C, wmOperator *op) void OBJECT_OT_select_random(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Random"); - ot->description = _("Set select on random visible objects"); + ot->name= "Select Random"; + ot->description = "Set select on random visible objects"; ot->idname= "OBJECT_OT_select_random"; /* api callbacks */ @@ -1044,8 +1042,8 @@ void OBJECT_OT_select_random(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, _("Percent"), _("Percentage of objects to select randomly"), 0.f, 100.0f); - RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend Selection"), _("Extend selection instead of deselecting everything first.")); + RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, "Percent", "Percentage of objects to select randomly", 0.f, 100.0f); + RNA_def_boolean(ot->srna, "extend", FALSE, "Extend Selection", "Extend selection instead of deselecting everything first."); } diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 96988d15ab2..fd2e7fd7c99 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -45,8 +45,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" @@ -299,9 +297,9 @@ static int shape_key_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_shape_key_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Shape Key"); + ot->name= "Add Shape Key"; ot->idname= "OBJECT_OT_shape_key_add"; - ot->description= _("Add shape key to the object"); + ot->description= "Add shape key to the object"; /* api callbacks */ ot->poll= shape_key_mode_poll; @@ -311,7 +309,7 @@ void OBJECT_OT_shape_key_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "from_mix", 1, _("From Mix"), _("Create the new shape key from the existing mix of keys.")); + RNA_def_boolean(ot->srna, "from_mix", 1, "From Mix", "Create the new shape key from the existing mix of keys."); } static int shape_key_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -327,9 +325,9 @@ static int shape_key_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Shape Key"); + ot->name= "Remove Shape Key"; ot->idname= "OBJECT_OT_shape_key_remove"; - ot->description= _("Remove shape key from the object"); + ot->description= "Remove shape key from the object"; /* api callbacks */ ot->poll= shape_key_mode_poll; @@ -360,8 +358,8 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Shape Keys"); - ot->description= _("Clear weights for all shape keys"); + ot->name= "Clear Shape Keys"; + ot->description= "Clear weights for all shape keys"; ot->idname= "OBJECT_OT_shape_key_clear"; /* api callbacks */ @@ -385,7 +383,7 @@ static int shape_key_mirror_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror Shape Key"); + ot->name= "Mirror Shape Key"; ot->idname= "OBJECT_OT_shape_key_mirror"; /* api callbacks */ @@ -448,13 +446,13 @@ static int shape_key_move_exec(bContext *C, wmOperator *op) void OBJECT_OT_shape_key_move(wmOperatorType *ot) { static EnumPropertyItem slot_move[] = { - {-1, "UP", 0, N_("Up"), ""}, - {1, "DOWN", 0, N_("Down"), ""}, + {-1, "UP", 0, "Up", ""}, + {1, "DOWN", 0, "Down", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Move Shape Key"); + ot->name= "Move Shape Key"; ot->idname= "OBJECT_OT_shape_key_move"; /* api callbacks */ @@ -464,6 +462,6 @@ void OBJECT_OT_shape_key_move(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(slot_move), 0, _("Type"), ""); + RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); } diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 1af45add512..78f3537bea9 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -46,8 +46,6 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_depsgraph.h" @@ -272,8 +270,8 @@ static int object_location_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_location_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Location"); - ot->description = _("Clear the object's location"); + ot->name= "Clear Location"; + ot->description = "Clear the object's location"; ot->idname= "OBJECT_OT_location_clear"; /* api callbacks */ @@ -292,8 +290,8 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_rotation_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Rotation"); - ot->description = _("Clear the object's rotation"); + ot->name= "Clear Rotation"; + ot->description = "Clear the object's rotation"; ot->idname= "OBJECT_OT_rotation_clear"; /* api callbacks */ @@ -312,8 +310,8 @@ static int object_scale_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_scale_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Scale"); - ot->description = _("Clear the object's scale"); + ot->name= "Clear Scale"; + ot->description = "Clear the object's scale"; ot->idname= "OBJECT_OT_scale_clear"; /* api callbacks */ @@ -358,8 +356,8 @@ static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_origin_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Origin"); - ot->description = _("Clear the object's origin"); + ot->name= "Clear Origin"; + ot->description = "Clear the object's origin"; ot->idname= "OBJECT_OT_origin_clear"; /* api callbacks */ @@ -587,8 +585,8 @@ static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_visual_transform_apply(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Apply Visual Transform"); - ot->description = _("Apply the object's visual transformation to its data"); + ot->name= "Apply Visual Transform"; + ot->description = "Apply the object's visual transformation to its data"; ot->idname= "OBJECT_OT_visual_transform_apply"; /* api callbacks */ @@ -616,8 +614,8 @@ static int object_transform_apply_exec(bContext *C, wmOperator *op) void OBJECT_OT_transform_apply(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Apply Object Transform"); - ot->description = _("Apply the object's transformation to its data"); + ot->name= "Apply Object Transform"; + ot->description = "Apply the object's transformation to its data"; ot->idname= "OBJECT_OT_transform_apply"; /* api callbacks */ @@ -627,9 +625,9 @@ void OBJECT_OT_transform_apply(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "location", 0, _("Location"), ""); - RNA_def_boolean(ot->srna, "rotation", 0, _("Rotation"), ""); - RNA_def_boolean(ot->srna, "scale", 0, _("Scale"), ""); + RNA_def_boolean(ot->srna, "location", 0, "Location", ""); + RNA_def_boolean(ot->srna, "rotation", 0, "Rotation", ""); + RNA_def_boolean(ot->srna, "scale", 0, "Scale", ""); } /********************* Set Object Center ************************/ @@ -917,21 +915,21 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_origin_set(wmOperatorType *ot) { static EnumPropertyItem prop_set_center_types[] = { - {GEOMETRY_TO_ORIGIN, "GEOMETRY_ORIGIN", 0, N_("Geometry to Origin"), N_("Move object geometry to object origin")}, - {ORIGIN_TO_GEOMETRY, "ORIGIN_GEOMETRY", 0, N_("Origin to Geometry"), N_("Move object origin to center of object geometry")}, - {ORIGIN_TO_CURSOR, "ORIGIN_CURSOR", 0, N_("Origin to 3D Cursor"), N_("Move object origin to position of the 3d cursor")}, + {GEOMETRY_TO_ORIGIN, "GEOMETRY_ORIGIN", 0, "Geometry to Origin", "Move object geometry to object origin"}, + {ORIGIN_TO_GEOMETRY, "ORIGIN_GEOMETRY", 0, "Origin to Geometry", "Move object origin to center of object geometry"}, + {ORIGIN_TO_CURSOR, "ORIGIN_CURSOR", 0, "Origin to 3D Cursor", "Move object origin to position of the 3d cursor"}, {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem prop_set_bounds_types[] = { - {V3D_CENTROID, "MEDIAN", 0, N_("Median Center"), ""}, - {V3D_CENTER, "BOUNDS", 0, N_("Bounds Center"), ""}, + {V3D_CENTROID, "MEDIAN", 0, "Median Center", ""}, + {V3D_CENTER, "BOUNDS", 0, "Bounds Center", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Set Origin"); - ot->description = _("Set the object's origin, by either moving the data, or set to center of data, or use 3d cursor"); + ot->name= "Set Origin"; + ot->description = "Set the object's origin, by either moving the data, or set to center of data, or use 3d cursor"; ot->idname= "OBJECT_OT_origin_set"; /* api callbacks */ @@ -943,7 +941,7 @@ void OBJECT_OT_origin_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_set_center_types), 0, _("Type"), ""); - RNA_def_enum(ot->srna, "center", RNA_enum_items_gettexted(prop_set_bounds_types), V3D_CENTROID, _("Center"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_set_center_types, 0, "Type", ""); + RNA_def_enum(ot->srna, "center", prop_set_bounds_types, V3D_CENTROID, "Center", ""); } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 04390612dd0..52ba9460818 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -53,8 +53,6 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_deform.h" @@ -1552,7 +1550,7 @@ static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Vertex Group"); + ot->name= "Add Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_add"; /* api callbacks */ @@ -1582,7 +1580,7 @@ static int vertex_group_remove_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Vertex Group"); + ot->name= "Remove Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_remove"; /* api callbacks */ @@ -1593,7 +1591,7 @@ void OBJECT_OT_vertex_group_remove(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 0, _("All"), _("Remove from all vertex groups.")); + RNA_def_boolean(ot->srna, "all", 0, "All", "Remove from all vertex groups."); } static int vertex_group_assign_exec(bContext *C, wmOperator *op) @@ -1614,7 +1612,7 @@ static int vertex_group_assign_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_assign(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Assign Vertex Group"); + ot->name= "Assign Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_assign"; /* api callbacks */ @@ -1625,7 +1623,7 @@ void OBJECT_OT_vertex_group_assign(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "new", 0, _("New"), _("Assign vertex to new vertex group.")); + RNA_def_boolean(ot->srna, "new", 0, "New", "Assign vertex to new vertex group."); } static int vertex_group_remove_from_exec(bContext *C, wmOperator *op) @@ -1653,7 +1651,7 @@ static int vertex_group_remove_from_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove from Vertex Group"); + ot->name= "Remove from Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_remove_from"; /* api callbacks */ @@ -1664,7 +1662,7 @@ void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "all", 0, _("All"), _("Remove from all vertex groups.")); + RNA_def_boolean(ot->srna, "all", 0, "All", "Remove from all vertex groups."); } static int vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1683,7 +1681,7 @@ static int vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Vertex Group"); + ot->name= "Select Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_select"; /* api callbacks */ @@ -1707,7 +1705,7 @@ static int vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Deselect Vertex Group"); + ot->name= "Deselect Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_deselect"; /* api callbacks */ @@ -1733,7 +1731,7 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Vertex Group"); + ot->name= "Copy Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_copy"; /* api callbacks */ @@ -1763,7 +1761,7 @@ static int vertex_group_levels_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_levels(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Vertex Group Levels"); + ot->name= "Vertex Group Levels"; ot->idname= "OBJECT_OT_vertex_group_levels"; /* api callbacks */ @@ -1773,8 +1771,8 @@ void OBJECT_OT_vertex_group_levels(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, N_("Offset"), N_("Value to add to weights."), -1.0f, 1.f); - RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, N_("Gain"), N_("Value to multiply weights by."), 0.0f, 10.f); + RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, "Offset", "Value to add to weights.", -1.0f, 1.f); + RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, "Gain", "Value to multiply weights by.", 0.0f, 10.f); } static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1793,7 +1791,7 @@ static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_normalize(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Normalize Vertex Group"); + ot->name= "Normalize Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_normalize"; /* api callbacks */ @@ -1821,7 +1819,7 @@ static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_normalize_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Normalize All Vertex Groups"); + ot->name= "Normalize All Vertex Groups"; ot->idname= "OBJECT_OT_vertex_group_normalize_all"; /* api callbacks */ @@ -1831,7 +1829,7 @@ void OBJECT_OT_vertex_group_normalize_all(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "lock_active", TRUE, _("Lock Active"), _("Keep the values of the active group while normalizing others.")); + RNA_def_boolean(ot->srna, "lock_active", TRUE, "Lock Active", "Keep the values of the active group while normalizing others."); } static int vertex_group_invert_exec(bContext *C, wmOperator *op) @@ -1851,7 +1849,7 @@ static int vertex_group_invert_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_invert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Invert Vertex Group"); + ot->name= "Invert Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_invert"; /* api callbacks */ @@ -1861,8 +1859,8 @@ void OBJECT_OT_vertex_group_invert(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "auto_assign", TRUE, _("Add Weights"), _("Add verts from groups that have zero weight before inverting.")); - RNA_def_boolean(ot->srna, "auto_remove", TRUE, _("Remove Weights"), _("Remove verts from groups that have zero weight after inverting.")); + RNA_def_boolean(ot->srna, "auto_assign", TRUE, "Add Weights", "Add verts from groups that have zero weight before inverting."); + RNA_def_boolean(ot->srna, "auto_remove", TRUE, "Remove Weights", "Remove verts from groups that have zero weight after inverting."); } @@ -1882,7 +1880,7 @@ static int vertex_group_blend_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_blend(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Blend Vertex Group"); + ot->name= "Blend Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_blend"; ot->description= ""; @@ -1916,9 +1914,9 @@ static int vertex_group_clean_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_clean(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clean Vertex Group"); + ot->name= "Clean Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_clean"; - ot->description= _("Remove Vertex Group assignments which aren't required"); + ot->description= "Remove Vertex Group assignments which aren't required"; /* api callbacks */ ot->poll= vertex_group_poll; @@ -1927,9 +1925,9 @@ void OBJECT_OT_vertex_group_clean(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, 1.0, _("Limit"), _("Remove weights under this limit."), 0.001f, 0.99f); - RNA_def_boolean(ot->srna, "all_groups", FALSE, _("All Groups"), _("Clean all vertex groups.")); - RNA_def_boolean(ot->srna, "keep_single", FALSE, _("Keep Single"), _("Keep verts assigned to at least one group when cleaning.")); + RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, 1.0, "Limit", "Remove weights under this limit.", 0.001f, 0.99f); + RNA_def_boolean(ot->srna, "all_groups", FALSE, "All Groups", "Clean all vertex groups."); + RNA_def_boolean(ot->srna, "keep_single", FALSE, "Keep Single", "Keep verts assigned to at least one group when cleaning."); } @@ -1949,9 +1947,9 @@ static int vertex_group_mirror_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror Vertex Group"); + ot->name= "Mirror Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_mirror"; - ot->description= _("Mirror all vertex groups, flip weights and/or names, editing only selected vertices, flipping when both sides are selected otherwise copy from unselected"); + ot->description= "Mirror all vertex groups, flip weights and/or names, editing only selected vertices, flipping when both sides are selected otherwise copy from unselected"; /* api callbacks */ ot->poll= vertex_group_poll_edit; @@ -1961,8 +1959,8 @@ void OBJECT_OT_vertex_group_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "mirror_weights", TRUE, _("Mirror Weights"), _("Mirror weights.")); - RNA_def_boolean(ot->srna, "flip_group_names", TRUE, _("Flip Groups"), _("Flip vertex group names.")); + RNA_def_boolean(ot->srna, "mirror_weights", TRUE, "Mirror Weights", "Mirror weights."); + RNA_def_boolean(ot->srna, "flip_group_names", TRUE, "Flip Groups", "Flip vertex group names."); } @@ -1995,9 +1993,9 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Vertex Groups to Linked"); + ot->name= "Copy Vertex Groups to Linked"; ot->idname= "OBJECT_OT_vertex_group_copy_to_linked"; - ot->description= _("Copy Vertex Groups to all users of the same Geometry data"); + ot->description= "Copy Vertex Groups to all users of the same Geometry data"; /* api callbacks */ ot->poll= vertex_group_poll; @@ -2033,9 +2031,9 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_copy_to_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Vertex Group to Selected"); + ot->name= "Copy Vertex Group to Selected"; ot->idname= "OBJECT_OT_vertex_group_copy_to_selected"; - ot->description= _("Copy Vertex Groups to other selected objects with matching indices"); + ot->description= "Copy Vertex Groups to other selected objects with matching indices"; /* api callbacks */ ot->poll= vertex_group_poll; @@ -2091,9 +2089,9 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Set Active Vertex Group"); + ot->name= "Set Active Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_set_active"; - ot->description= _("Set the active vertex group"); + ot->description= "Set the active vertex group"; /* api callbacks */ ot->poll= vertex_group_poll; @@ -2104,7 +2102,7 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, _("Group"), _("Vertex group to set as active.")); + prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active."); RNA_def_enum_funcs(prop, vgroup_itemf); ot->prop= prop; } @@ -2223,9 +2221,9 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_sort(wmOperatorType *ot) { - ot->name= _("Sort Vertex Groups"); + ot->name= "Sort Vertex Groups"; ot->idname= "OBJECT_OT_vertex_group_sort"; - ot->description= _("Sorts vertex groups alphabetically"); + ot->description= "Sorts vertex groups alphabetically"; /* api callbacks */ ot->poll= vertex_group_poll; @@ -2276,13 +2274,13 @@ static int vgroup_move_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_move(wmOperatorType *ot) { static EnumPropertyItem vgroup_slot_move[] = { - {1, "UP", 0, N_("Up"), ""}, - {-1, "DOWN", 0, N_("Down"), ""}, + {1, "UP", 0, "Up", ""}, + {-1, "DOWN", 0, "Down", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Move Vertex Group"); + ot->name= "Move Vertex Group"; ot->idname= "OBJECT_OT_vertex_group_move"; /* api callbacks */ @@ -2292,5 +2290,5 @@ void OBJECT_OT_vertex_group_move(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(vgroup_slot_move), 0, _("Direction"), _("Direction to move, UP or DOWN")); + RNA_def_enum(ot->srna, "direction", vgroup_slot_move, 0, "Direction", "Direction to move, UP or DOWN"); } diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 931c6f9334f..f32b23cd3ee 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript index ef82ab2423b..188416eb04c 100644 --- a/source/blender/editors/physics/SConscript +++ b/source/blender/editors/physics/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu ../../blenloader' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 55f8c859a3b..4b0c1cb1222 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -53,8 +53,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_DerivedMesh.h" #include "BKE_depsgraph.h" @@ -1358,7 +1356,7 @@ static int select_all_exec(bContext *C, wmOperator *op) void PARTICLE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Selection of all particles"); + ot->name= "Selection of all particles"; ot->idname= "PARTICLE_OT_select_all"; /* api callbacks */ @@ -1432,7 +1430,7 @@ static int select_roots_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_roots(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Roots"); + ot->name= "Select Roots"; ot->idname= "PARTICLE_OT_select_roots"; /* api callbacks */ @@ -1472,7 +1470,7 @@ static int select_tips_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_tips(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Tips"); + ot->name= "Select Tips"; ot->idname= "PARTICLE_OT_select_tips"; /* api callbacks */ @@ -1516,7 +1514,7 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *event) void PARTICLE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked"); + ot->name= "Select Linked"; ot->idname= "PARTICLE_OT_select_linked"; /* api callbacks */ @@ -1528,8 +1526,8 @@ void PARTICLE_OT_select_linked(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "deselect", 0, _("Deselect"), _("Deselect linked keys rather than selecting them.")); - RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, _("Location"), "", 0, 16384); + RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect linked keys rather than selecting them."); + RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, "Location", "", 0, 16384); } /************************ border select operator ************************/ @@ -1704,7 +1702,7 @@ static int hide_exec(bContext *C, wmOperator *op) void PARTICLE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide Selected"); + ot->name= "Hide Selected"; ot->idname= "PARTICLE_OT_hide"; /* api callbacks */ @@ -1715,7 +1713,7 @@ void PARTICLE_OT_hide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } /*************************** reveal operator **************************/ @@ -1746,7 +1744,7 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal"); + ot->name= "Reveal"; ot->idname= "PARTICLE_OT_reveal"; /* api callbacks */ @@ -1804,7 +1802,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Less"); + ot->name= "Select Less"; ot->idname= "PARTICLE_OT_select_less"; /* api callbacks */ @@ -1865,7 +1863,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select More"); + ot->name= "Select More"; ot->idname= "PARTICLE_OT_select_more"; /* api callbacks */ @@ -1902,7 +1900,7 @@ static int select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); + ot->name= "Select Inverse"; ot->idname= "PARTICLE_OT_select_inverse"; /* api callbacks */ @@ -1998,7 +1996,7 @@ static int rekey_exec(bContext *C, wmOperator *op) void PARTICLE_OT_rekey(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rekey"); + ot->name= "Rekey"; ot->idname= "PARTICLE_OT_rekey"; /* api callbacks */ @@ -2010,7 +2008,7 @@ void PARTICLE_OT_rekey(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "keys", 2, 2, INT_MAX, _("Number of Keys"), "", 2, 100); + RNA_def_int(ot->srna, "keys", 2, 2, INT_MAX, "Number of Keys", "", 2, 100); } static void rekey_particle_to_time(Scene *scene, Object *ob, int pa_index, float path_time) @@ -2328,7 +2326,7 @@ static int subdivide_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Subdivide"); + ot->name= "Subdivide"; ot->idname= "PARTICLE_OT_subdivide"; /* api callbacks */ @@ -2416,7 +2414,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op) void PARTICLE_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Doubles"); + ot->name= "Remove Doubles"; ot->idname= "PARTICLE_OT_remove_doubles"; /* api callbacks */ @@ -2427,7 +2425,7 @@ void PARTICLE_OT_remove_doubles(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, _("Threshold"), _("Threshold distance withing which particles are removed"), 0.00001f, 0.1f); + RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, "Threshold", "Threshold distance withing which particles are removed", 0.00001f, 0.1f); } @@ -2466,7 +2464,7 @@ static int weight_set_exec(bContext *C, wmOperator *op) void PARTICLE_OT_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Weight Set"); + ot->name= "Weight Set"; ot->idname= "PARTICLE_OT_weight_set"; /* api callbacks */ @@ -2476,7 +2474,7 @@ void PARTICLE_OT_weight_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "factor", 1, 0, 1, _("Factor"), "", 0, 1); + RNA_def_float(ot->srna, "factor", 1, 0, 1, "Factor", "", 0, 1); } /************************ cursor drawing *******************************/ @@ -2569,7 +2567,7 @@ static int delete_exec(bContext *C, wmOperator *op) void PARTICLE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); + ot->name= "Delete"; ot->idname= "PARTICLE_OT_delete"; /* api callbacks */ @@ -2581,7 +2579,7 @@ void PARTICLE_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, _("Type"), _("Delete a full particle or only keys.")); + ot->prop= RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, "Type", "Delete a full particle or only keys."); } /*************************** mirror operator **************************/ @@ -2729,7 +2727,7 @@ static int mirror_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror"); + ot->name= "Mirror"; ot->idname= "PARTICLE_OT_mirror"; /* api callbacks */ @@ -3746,7 +3744,7 @@ static int brush_edit_cancel(bContext *UNUSED(C), wmOperator *op) void PARTICLE_OT_brush_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Brush Edit"); + ot->name= "Brush Edit"; ot->idname= "PARTICLE_OT_brush_edit"; /* api callbacks */ @@ -3760,7 +3758,7 @@ void PARTICLE_OT_brush_edit(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } /*********************** undo ***************************/ @@ -4236,7 +4234,7 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_particle_edit_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Particle Edit Toggle"); + ot->name= "Particle Edit Toggle"; ot->idname= "PARTICLE_OT_particle_edit_toggle"; /* api callbacks */ @@ -4285,7 +4283,7 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_edited_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Edited"); + ot->name= "Clear Edited"; ot->idname= "PARTICLE_OT_edited_clear"; /* api callbacks */ diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 8392c25f46e..8ec95e9b107 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -43,8 +43,6 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_DerivedMesh.h" @@ -87,9 +85,9 @@ static int particle_system_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_particle_system_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Particle System Slot"); + ot->name= "Add Particle System Slot"; ot->idname= "OBJECT_OT_particle_system_add"; - ot->description=_("Add a particle system"); + ot->description="Add a particle system"; /* api callbacks */ ot->poll= ED_operator_object_active_editable; @@ -126,9 +124,9 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_particle_system_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Particle System Slot"); + ot->name= "Remove Particle System Slot"; ot->idname= "OBJECT_OT_particle_system_remove"; - ot->description=_("Remove the selected particle system"); + ot->description="Remove the selected particle system"; /* api callbacks */ ot->poll= ED_operator_object_active_editable; @@ -185,9 +183,9 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Particle Settings"); + ot->name= "New Particle Settings"; ot->idname= "PARTICLE_OT_new"; - ot->description=_("Add new particle settings"); + ot->description="Add new particle settings"; /* api callbacks */ ot->exec= new_particle_settings_exec; @@ -234,9 +232,9 @@ static int new_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_new_target(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Particle Target"); + ot->name= "New Particle Target"; ot->idname= "PARTICLE_OT_new_target"; - ot->description=_("Add a new particle target"); + ot->description="Add a new particle target"; /* api callbacks */ ot->exec= new_particle_target_exec; @@ -283,9 +281,9 @@ static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Particle Target"); + ot->name= "Remove Particle Target"; ot->idname= "PARTICLE_OT_target_remove"; - ot->description=_("Remove the selected particle target"); + ot->description="Remove the selected particle target"; /* api callbacks */ ot->exec= remove_particle_target_exec; @@ -323,9 +321,9 @@ static int target_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_move_up(wmOperatorType *ot) { - ot->name= _("Move Up Target"); + ot->name= "Move Up Target"; ot->idname= "PARTICLE_OT_target_move_up"; - ot->description= _("Move particle target up in the list"); + ot->description= "Move particle target up in the list"; ot->exec= target_move_up_exec; @@ -361,9 +359,9 @@ static int target_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_move_down(wmOperatorType *ot) { - ot->name= _("Move Down Target"); + ot->name= "Move Down Target"; ot->idname= "PARTICLE_OT_target_move_down"; - ot->description= _("Move particle target down in the list"); + ot->description= "Move particle target down in the list"; ot->exec= target_move_down_exec; @@ -399,9 +397,9 @@ static int dupliob_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_move_up(wmOperatorType *ot) { - ot->name= _("Move Up Dupli Object"); + ot->name= "Move Up Dupli Object"; ot->idname= "PARTICLE_OT_dupliob_move_up"; - ot->description= _("Move dupli object up in the list"); + ot->description= "Move dupli object up in the list"; ot->exec= dupliob_move_up_exec; @@ -439,9 +437,9 @@ static int copy_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Particle Dupliob"); + ot->name= "Copy Particle Dupliob"; ot->idname= "PARTICLE_OT_dupliob_copy"; - ot->description=_("Duplicate the current dupliobject"); + ot->description="Duplicate the current dupliobject"; /* api callbacks */ ot->exec= copy_particle_dupliob_exec; @@ -482,9 +480,9 @@ static int remove_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Particle Dupliobject"); + ot->name= "Remove Particle Dupliobject"; ot->idname= "PARTICLE_OT_dupliob_remove"; - ot->description=_("Remove the selected dupliobject"); + ot->description="Remove the selected dupliobject"; /* api callbacks */ ot->exec= remove_particle_dupliob_exec; @@ -521,9 +519,9 @@ static int dupliob_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot) { - ot->name= _("Move Down Dupli Object"); + ot->name= "Move Down Dupli Object"; ot->idname= "PARTICLE_OT_dupliob_move_down"; - ot->description= _("Move dupli object down in the list"); + ot->description= "Move dupli object down in the list"; ot->exec= dupliob_move_down_exec; @@ -611,8 +609,8 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op) void PARTICLE_OT_disconnect_hair(wmOperatorType *ot) { - ot->name= _("Disconnect Hair"); - ot->description= _("Disconnect hair from the emitter mesh"); + ot->name= "Disconnect Hair"; + ot->description= "Disconnect hair from the emitter mesh"; ot->idname= "PARTICLE_OT_disconnect_hair"; ot->exec= disconnect_hair_exec; @@ -620,7 +618,7 @@ void PARTICLE_OT_disconnect_hair(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "all", 0, _("All hair"), _("Disconnect all hair systems from the emitter mesh")); + RNA_def_boolean(ot->srna, "all", 0, "All hair", "Disconnect all hair systems from the emitter mesh"); } static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys) @@ -749,8 +747,8 @@ static int connect_hair_exec(bContext *C, wmOperator *op) void PARTICLE_OT_connect_hair(wmOperatorType *ot) { - ot->name= _("Connect Hair"); - ot->description= _("Connect hair to the emitter mesh"); + ot->name= "Connect Hair"; + ot->description= "Connect hair to the emitter mesh"; ot->idname= "PARTICLE_OT_connect_hair"; ot->exec= connect_hair_exec; @@ -758,6 +756,6 @@ void PARTICLE_OT_connect_hair(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "all", 0, _("All hair"), _("Connect all hair systems to the emitter mesh")); + RNA_def_boolean(ot->srna, "all", 0, "All hair", "Connect all hair systems to the emitter mesh"); } diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 093e77bfb67..34f4a1e472b 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -39,8 +39,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "BKE_context.h" @@ -157,8 +155,8 @@ static int ptcache_free_bake_all_exec(bContext *C, wmOperator *UNUSED(op)) void PTCACHE_OT_bake_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Bake All Physics"); - ot->description= _("Bake all physics"); + ot->name= "Bake All Physics"; + ot->description= "Bake all physics"; ot->idname= "PTCACHE_OT_bake_all"; /* api callbacks */ @@ -168,7 +166,7 @@ void PTCACHE_OT_bake_all(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "bake", 1, _("Bake"), ""); + RNA_def_boolean(ot->srna, "bake", 1, "Bake", ""); } void PTCACHE_OT_free_bake_all(wmOperatorType *ot) { @@ -270,8 +268,8 @@ static int ptcache_bake_from_cache_exec(bContext *C, wmOperator *UNUSED(op)) void PTCACHE_OT_bake(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Bake Physics"); - ot->description= _("Bake physics"); + ot->name= "Bake Physics"; + ot->description= "Bake physics"; ot->idname= "PTCACHE_OT_bake"; /* api callbacks */ @@ -281,7 +279,7 @@ void PTCACHE_OT_bake(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "bake", 0, _("Bake"), ""); + RNA_def_boolean(ot->srna, "bake", 0, "Bake", ""); } void PTCACHE_OT_free_bake(wmOperatorType *ot) { diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index 7d50db14d4f..53418500ea6 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 6d3bbb45fb7..42a163d3da5 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -41,8 +41,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "BKE_blender.h" @@ -602,8 +600,8 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) void RENDER_OT_render(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Render"); - ot->description= _("Render active scene"); + ot->name= "Render"; + ot->description= "Render active scene"; ot->idname= "RENDER_OT_render"; /* api callbacks */ @@ -613,9 +611,9 @@ void RENDER_OT_render(wmOperatorType *ot) /*ot->poll= ED_operator_screenactive;*/ /* this isnt needed, causes failer in background mode */ - RNA_def_boolean(ot->srna, "animation", 0, _("Animation"), _("Render files from the animation range of this scene")); - RNA_def_boolean(ot->srna, "write_still", 0, _("Write Image"), _("Save rendered the image to the output path (used only when animation is disabled)")); - RNA_def_string(ot->srna, "layer", "", RE_MAXNAME, _("Render Layer"), _("Single render layer to re-render")); - RNA_def_string(ot->srna, "scene", "", MAX_ID_NAME-2, _("Scene"), _("Re-render single layer in this scene")); + RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene"); + RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)"); + RNA_def_string(ot->srna, "layer", "", RE_MAXNAME, "Render Layer", "Single render layer to re-render"); + RNA_def_string(ot->srna, "scene", "", MAX_ID_NAME-2, "Scene", "Re-render single layer in this scene"); } diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index deb226e0113..3256112426b 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -43,8 +43,6 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "DNA_object_types.h" @@ -599,8 +597,8 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op) void RENDER_OT_opengl(wmOperatorType *ot) { /* identifiers */ - ot->name= _("OpenGL Render"); - ot->description= _("OpenGL render active viewport"); + ot->name= "OpenGL Render"; + ot->description= "OpenGL render active viewport"; ot->idname= "RENDER_OT_opengl"; /* api callbacks */ @@ -611,9 +609,9 @@ void RENDER_OT_opengl(wmOperatorType *ot) ot->poll= ED_operator_screenactive; - RNA_def_boolean(ot->srna, "animation", 0, _("Animation"), _("Render files from the animation range of this scene")); - RNA_def_boolean(ot->srna, "write_still", 0, _("Write Image"), _("Save rendered the image to the output path (used only when animation is disabled)")); - RNA_def_boolean(ot->srna, "view_context", 1, _("View Context"), _("Use the current 3D view for rendering, else use scene settings.")); + RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene"); + RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)"); + RNA_def_boolean(ot->srna, "view_context", 1, "View Context", "Use the current 3D view for rendering, else use scene settings."); } /* function for getting an opengl buffer from a View3D, used by sequencer */ diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 6935928c643..6a1eea92563 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -50,8 +50,6 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -111,9 +109,9 @@ static int material_slot_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Material Slot"); + ot->name= "Add Material Slot"; ot->idname= "OBJECT_OT_material_slot_add"; - ot->description=_("Add a new material slot"); + ot->description="Add a new material slot"; /* api callbacks */ ot->exec= material_slot_add_exec; @@ -147,9 +145,9 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op) void OBJECT_OT_material_slot_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Material Slot"); + ot->name= "Remove Material Slot"; ot->idname= "OBJECT_OT_material_slot_remove"; - ot->description=_("Remove the selected material slot"); + ot->description="Remove the selected material slot"; /* api callbacks */ ot->exec= material_slot_remove_exec; @@ -207,9 +205,9 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_assign(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Assign Material Slot"); + ot->name= "Assign Material Slot"; ot->idname= "OBJECT_OT_material_slot_assign"; - ot->description=_("Assign the material in the selected material slot to the selected vertices"); + ot->description="Assign the material in the selected material slot to the selected vertices"; /* api callbacks */ ot->exec= material_slot_assign_exec; @@ -294,9 +292,9 @@ static int material_slot_select_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Material Slot"); + ot->name= "Select Material Slot"; ot->idname= "OBJECT_OT_material_slot_select"; - ot->description=_("Select vertices assigned to the selected material slot"); + ot->description="Select vertices assigned to the selected material slot"; /* api callbacks */ ot->exec= material_slot_select_exec; @@ -313,9 +311,9 @@ static int material_slot_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_deselect(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Deselect Material Slot"); + ot->name= "Deselect Material Slot"; ot->idname= "OBJECT_OT_material_slot_deselect"; - ot->description=_("Deselect vertices assigned to the selected material slot"); + ot->description="Deselect vertices assigned to the selected material slot"; /* api callbacks */ ot->exec= material_slot_deselect_exec; @@ -353,9 +351,9 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_material_slot_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Material to Others"); + ot->name= "Copy Material to Others"; ot->idname= "OBJECT_OT_material_slot_copy"; - ot->description=_("Copies materials to other selected objects"); + ot->description="Copies materials to other selected objects"; /* api callbacks */ ot->exec= material_slot_copy_exec; @@ -399,9 +397,9 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) void MATERIAL_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Material"); + ot->name= "New Material"; ot->idname= "MATERIAL_OT_new"; - ot->description=_("Add a new material"); + ot->description="Add a new material"; /* api callbacks */ ot->exec= new_material_exec; @@ -445,9 +443,9 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op)) void TEXTURE_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Texture"); + ot->name= "New Texture"; ot->idname= "TEXTURE_OT_new"; - ot->description=_("Add a new texture"); + ot->description="Add a new texture"; /* api callbacks */ ot->exec= new_texture_exec; @@ -491,9 +489,9 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) void WORLD_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New World"); + ot->name= "New World"; ot->idname= "WORLD_OT_new"; - ot->description= _("Add a new world"); + ot->description= "Add a new world"; /* api callbacks */ ot->exec= new_world_exec; @@ -519,9 +517,9 @@ static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) void SCENE_OT_render_layer_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Render Layer"); + ot->name= "Add Render Layer"; ot->idname= "SCENE_OT_render_layer_add"; - ot->description=_("Add a render layer"); + ot->description="Add a render layer"; /* api callbacks */ ot->exec= render_layer_add_exec; @@ -567,9 +565,9 @@ static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) void SCENE_OT_render_layer_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Render Layer"); + ot->name= "Remove Render Layer"; ot->idname= "SCENE_OT_render_layer_remove"; - ot->description=_("Remove the selected render layer"); + ot->description="Remove the selected render layer"; /* api callbacks */ ot->exec= render_layer_remove_exec; @@ -645,15 +643,15 @@ static int texture_slot_move(bContext *C, wmOperator *op) void TEXTURE_OT_slot_move(wmOperatorType *ot) { static EnumPropertyItem slot_move[] = { - {-1, "UP", 0, N_("Up"), ""}, - {1, "DOWN", 0, N_("Down"), ""}, + {-1, "UP", 0, "Up", ""}, + {1, "DOWN", 0, "Down", ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= _("Move Texture Slot"); + ot->name= "Move Texture Slot"; ot->idname= "TEXTURE_OT_slot_move"; - ot->description=_("Move texture slots up and down"); + ot->description="Move texture slots up and down"; /* api callbacks */ ot->exec= texture_slot_move; @@ -661,7 +659,7 @@ void TEXTURE_OT_slot_move(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(slot_move), 0, _("Type"), ""); + RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); } @@ -745,9 +743,9 @@ void TEXTURE_OT_envmap_save(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= _("Save Environment Map"); + ot->name= "Save Environment Map"; ot->idname= "TEXTURE_OT_envmap_save"; - ot->description=_("Save the current generated Environment map to an image file"); + ot->description="Save the current generated Environment map to an image file"; /* api callbacks */ ot->exec= envmap_save_exec; @@ -792,9 +790,9 @@ static int envmap_clear_poll(bContext *C) void TEXTURE_OT_envmap_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Environment Map"); + ot->name= "Clear Environment Map"; ot->idname= "TEXTURE_OT_envmap_clear"; - ot->description=_("Discard the environment map and free it from memory"); + ot->description="Discard the environment map and free it from memory"; /* api callbacks */ ot->exec= envmap_clear_exec; @@ -821,9 +819,9 @@ static int envmap_clear_all_exec(bContext *C, wmOperator *UNUSED(op)) void TEXTURE_OT_envmap_clear_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear All Environment Maps"); + ot->name= "Clear All Environment Maps"; ot->idname= "TEXTURE_OT_envmap_clear_all"; - ot->description=_("Discard all environment maps in the .blend file and free them from memory"); + ot->description="Discard all environment maps in the .blend file and free them from memory"; /* api callbacks */ ot->exec= envmap_clear_all_exec; @@ -851,9 +849,9 @@ static int copy_material_exec(bContext *C, wmOperator *UNUSED(op)) void MATERIAL_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Material"); + ot->name= "Copy Material"; ot->idname= "MATERIAL_OT_copy"; - ot->description=_("Copy the material settings and nodes"); + ot->description="Copy the material settings and nodes"; /* api callbacks */ ot->exec= copy_material_exec; @@ -879,9 +877,9 @@ static int paste_material_exec(bContext *C, wmOperator *UNUSED(op)) void MATERIAL_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Material"); + ot->name= "Paste Material"; ot->idname= "MATERIAL_OT_paste"; - ot->description=_("Paste the material settings and nodes"); + ot->description="Paste the material settings and nodes"; /* api callbacks */ ot->exec= paste_material_exec; @@ -996,9 +994,9 @@ static int copy_mtex_poll(bContext *C) void TEXTURE_OT_slot_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Texture Slot Settings"); + ot->name= "Copy Texture Slot Settings"; ot->idname= "TEXTURE_OT_slot_copy"; - ot->description=_("Copy the material texture settings and nodes"); + ot->description="Copy the material texture settings and nodes"; /* api callbacks */ ot->exec= copy_mtex_exec; @@ -1041,9 +1039,9 @@ static int paste_mtex_exec(bContext *C, wmOperator *UNUSED(op)) void TEXTURE_OT_slot_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Texture Slot Settings"); + ot->name= "Paste Texture Slot Settings"; ot->idname= "TEXTURE_OT_slot_paste"; - ot->description=_("Copy the texture settings and nodes"); + ot->description="Copy the texture settings and nodes"; /* api callbacks */ ot->exec= paste_mtex_exec; diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 3fa6c2123a8..9dfcde6ed0d 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -36,8 +36,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "BKE_blender.h" @@ -282,8 +280,8 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) void RENDER_OT_view_cancel(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cancel Render View"); - ot->description= _("Cancel show render view"); + ot->name= "Cancel Render View"; + ot->description= "Cancel show render view"; ot->idname= "RENDER_OT_view_cancel"; /* api callbacks */ @@ -349,8 +347,8 @@ static int render_view_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent void RENDER_OT_view_show(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Show/Hide Render View"); - ot->description= _("Toggle show render view"); + ot->name= "Show/Hide Render View"; + ot->description= "Toggle show render view"; ot->idname= "RENDER_OT_view_show"; /* api callbacks */ diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 9f6aba9fc7b..5cc42e2b6cf 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -40,8 +40,6 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_armature_types.h" #include "DNA_lattice_types.h" #include "DNA_object_types.h" @@ -640,8 +638,8 @@ static int actionzone_cancel(bContext *UNUSED(C), wmOperator *op) static void SCREEN_OT_actionzone(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Handle area action zones"); - ot->description= _("Handle area action zones for mouse actions/gestures"); + ot->name= "Handle area action zones"; + ot->description= "Handle area action zones for mouse actions/gestures"; ot->idname= "SCREEN_OT_actionzone"; ot->invoke= actionzone_invoke; @@ -651,7 +649,7 @@ static void SCREEN_OT_actionzone(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; - RNA_def_int(ot->srna, "modifier", 0, 0, 2, _("modifier"), _("modifier state"), 0, 2); + RNA_def_int(ot->srna, "modifier", 0, 0, 2, "modifier", "modifier state", 0, 2); } /* ************** swap area operator *********************************** */ @@ -763,8 +761,8 @@ static int area_swap_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_swap(wmOperatorType *ot) { - ot->name= _("Swap areas"); - ot->description= _("Swap selected areas screen positions"); + ot->name= "Swap areas"; + ot->description= "Swap selected areas screen positions"; ot->idname= "SCREEN_OT_area_swap"; ot->invoke= area_swap_invoke; @@ -831,8 +829,8 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_dupli(wmOperatorType *ot) { - ot->name= _("Duplicate Area into New Window"); - ot->description= _("Duplicate selected area into new window"); + ot->name= "Duplicate Area into New Window"; + ot->description= "Duplicate selected area into new window"; ot->idname= "SCREEN_OT_area_dupli"; ot->invoke= area_dupli_invoke; @@ -1079,8 +1077,8 @@ static int area_move_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move area edges"); - ot->description= _("Move selected area edges"); + ot->name= "Move area edges"; + ot->description= "Move selected area edges"; ot->idname= "SCREEN_OT_area_move"; ot->exec= area_move_exec; @@ -1094,7 +1092,7 @@ static void SCREEN_OT_area_move(wmOperatorType *ot) /* rna */ RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, _("Delta"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); } /* ************** split area operator *********************************** */ @@ -1493,14 +1491,14 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event) } static EnumPropertyItem prop_direction_items[] = { -{'h', "HORIZONTAL", 0, N_("Horizontal"), ""}, -{'v', "VERTICAL", 0, N_("Vertical"), ""}, +{'h', "HORIZONTAL", 0, "Horizontal", ""}, +{'v', "VERTICAL", 0, "Vertical", ""}, {0, NULL, 0, NULL, NULL}}; static void SCREEN_OT_area_split(wmOperatorType *ot) { - ot->name = _("Split area"); - ot->description= _("Split selected area into new windows"); + ot->name = "Split area"; + ot->description= "Split selected area into new windows"; ot->idname = "SCREEN_OT_area_split"; ot->exec= area_split_exec; @@ -1512,10 +1510,10 @@ static void SCREEN_OT_area_split(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* rna */ - RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(prop_direction_items), 'h', _("Direction"), ""); - RNA_def_float(ot->srna, "factor", 0.5f, 0.0, 1.0, _("Factor"), "", 0.0, 1.0); - RNA_def_int(ot->srna, "mouse_x", -100, INT_MIN, INT_MAX, _("Mouse X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "mouse_y", -100, INT_MIN, INT_MAX, _("Mouse Y"), "", INT_MIN, INT_MAX); + RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', "Direction", ""); + RNA_def_float(ot->srna, "factor", 0.5f, 0.0, 1.0, "Factor", "", 0.0, 1.0); + RNA_def_int(ot->srna, "mouse_x", -100, INT_MIN, INT_MAX, "Mouse X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "mouse_y", -100, INT_MIN, INT_MAX, "Mouse Y", "", INT_MIN, INT_MAX); } @@ -1716,8 +1714,8 @@ static int region_scale_cancel(bContext *UNUSED(C), wmOperator *op) static void SCREEN_OT_region_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scale Region Size"); - ot->description= _("Scale selected area"); + ot->name= "Scale Region Size"; + ot->description= "Scale selected area"; ot->idname= "SCREEN_OT_region_scale"; ot->invoke= region_scale_invoke; @@ -1753,7 +1751,7 @@ static int frame_offset_exec(bContext *C, wmOperator *op) static void SCREEN_OT_frame_offset(wmOperatorType *ot) { - ot->name = _("Frame Offset"); + ot->name = "Frame Offset"; ot->idname = "SCREEN_OT_frame_offset"; ot->exec= frame_offset_exec; @@ -1762,7 +1760,7 @@ static void SCREEN_OT_frame_offset(wmOperatorType *ot) ot->flag= 0; /* rna */ - RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, _("Delta"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); } @@ -1803,8 +1801,8 @@ static int frame_jump_exec(bContext *C, wmOperator *op) static void SCREEN_OT_frame_jump(wmOperatorType *ot) { - ot->name = _("Jump to Endpoint"); - ot->description= _("Jump to first/last frame in frame range"); + ot->name = "Jump to Endpoint"; + ot->description= "Jump to first/last frame in frame range"; ot->idname = "SCREEN_OT_frame_jump"; ot->exec= frame_jump_exec; @@ -1813,7 +1811,7 @@ static void SCREEN_OT_frame_jump(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* rna */ - RNA_def_boolean(ot->srna, "end", 0, _("Last Frame"), _("Jump to the last frame of the frame range.")); + RNA_def_boolean(ot->srna, "end", 0, "Last Frame", "Jump to the last frame of the frame range."); } @@ -1886,8 +1884,8 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op) static void SCREEN_OT_keyframe_jump(wmOperatorType *ot) { - ot->name = _("Jump to Keyframe"); - ot->description= _("Jump to previous/next keyframe"); + ot->name = "Jump to Keyframe"; + ot->description= "Jump to previous/next keyframe"; ot->idname = "SCREEN_OT_keyframe_jump"; ot->exec= keyframe_jump_exec; @@ -1896,7 +1894,7 @@ static void SCREEN_OT_keyframe_jump(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* rna */ - RNA_def_boolean(ot->srna, "next", 1, _("Next Keyframe"), ""); + RNA_def_boolean(ot->srna, "next", 1, "Next Keyframe", ""); } /* ************** switch screen operator ***************************** */ @@ -1950,15 +1948,15 @@ static int screen_set_exec(bContext *C, wmOperator *op) static void SCREEN_OT_screen_set(wmOperatorType *ot) { - ot->name = _("Set Screen"); - ot->description= _("Cycle through available screens"); + ot->name = "Set Screen"; + ot->description= "Cycle through available screens"; ot->idname = "SCREEN_OT_screen_set"; ot->exec= screen_set_exec; ot->poll= ED_operator_screenactive; /* rna */ - RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, _("Delta"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); } /* ************** screen full-area operator ***************************** */ @@ -1984,8 +1982,8 @@ static int screen_full_area_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_screen_full_area(wmOperatorType *ot) { - ot->name = _("Toggle Full Screen"); - ot->description= _("Toggle display selected area as fullscreen"); + ot->name = "Toggle Full Screen"; + ot->description= "Toggle display selected area as fullscreen"; ot->idname = "SCREEN_OT_screen_full_area"; ot->exec= screen_full_area_exec; @@ -2272,8 +2270,8 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_join(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Join area"); - ot->description= _("Join selected areas into new window"); + ot->name= "Join area"; + ot->description= "Join selected areas into new window"; ot->idname= "SCREEN_OT_area_join"; /* api callbacks */ @@ -2331,8 +2329,8 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, wmEvent *even static void SCREEN_OT_area_options(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Area Options"); - ot->description= _("Operations for splitting and merging"); + ot->name= "Area Options"; + ot->description= "Operations for splitting and merging"; ot->idname= "SCREEN_OT_area_options"; /* api callbacks */ @@ -2372,8 +2370,8 @@ static int spacedata_cleanup(bContext *C, wmOperator *op) static void SCREEN_OT_spacedata_cleanup(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clean-up space-data"); - ot->description= _("Remove unused settings for invisible editors"); + ot->name= "Clean-up space-data"; + ot->description= "Remove unused settings for invisible editors"; ot->idname= "SCREEN_OT_spacedata_cleanup"; /* api callbacks */ @@ -2397,8 +2395,8 @@ static int repeat_last_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_repeat_last(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Repeat Last"); - ot->description= _("Repeat last action"); + ot->name= "Repeat Last"; + ot->description= "Repeat last action"; ot->idname= "SCREEN_OT_repeat_last"; /* api callbacks */ @@ -2450,8 +2448,8 @@ static int repeat_history_exec(bContext *C, wmOperator *op) static void SCREEN_OT_repeat_history(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Repeat History"); - ot->description= _("Display menu for previous actions performed"); + ot->name= "Repeat History"; + ot->description= "Display menu for previous actions performed"; ot->idname= "SCREEN_OT_repeat_history"; /* api callbacks */ @@ -2460,7 +2458,7 @@ static void SCREEN_OT_repeat_history(wmOperatorType *ot) ot->poll= ED_operator_screenactive; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), "", 0, 1000); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, 1000); } /* ********************** redo operator ***************************** */ @@ -2478,8 +2476,8 @@ static int redo_last_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED static void SCREEN_OT_redo_last(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Redo Last"); - ot->description= _("Display menu for last action performed"); + ot->name= "Redo Last"; + ot->description= "Display menu for last action performed"; ot->idname= "SCREEN_OT_redo_last"; /* api callbacks */ @@ -2581,8 +2579,8 @@ static int region_quadview_exec(bContext *C, wmOperator *op) static void SCREEN_OT_region_quadview(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Quad View"); - ot->description= _("Split selected area into camera, front, right & top views"); + ot->name= "Toggle Quad View"; + ot->description= "Split selected area into camera, front, right & top views"; ot->idname= "SCREEN_OT_region_quadview"; /* api callbacks */ @@ -2623,7 +2621,7 @@ static int region_flip_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_region_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Flip Region"); + ot->name= "Flip Region"; ot->idname= "SCREEN_OT_region_flip"; /* api callbacks */ @@ -2672,7 +2670,7 @@ static int header_flip_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_header_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Flip Header Region"); + ot->name= "Flip Header Region"; ot->idname= "SCREEN_OT_header_flip"; /* api callbacks */ @@ -2718,8 +2716,8 @@ static int header_toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *U static void SCREEN_OT_header_toolbox(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Header Toolbox"); - ot->description=_("Display header region toolbox"); + ot->name= "Header Toolbox"; + ot->description="Display header region toolbox"; ot->idname= "SCREEN_OT_header_toolbox"; /* api callbacks */ @@ -2919,8 +2917,8 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), wmEvent *e static void SCREEN_OT_animation_step(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Animation Step"); - ot->description= _("Step through animation by position"); + ot->name= "Animation Step"; + ot->description= "Step through animation by position"; ot->idname= "SCREEN_OT_animation_step"; /* api callbacks */ @@ -2976,8 +2974,8 @@ static int screen_animation_play_exec(bContext *C, wmOperator *op) static void SCREEN_OT_animation_play(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Play Animation"); - ot->description= _("Play animation"); + ot->name= "Play Animation"; + ot->description= "Play animation"; ot->idname= "SCREEN_OT_animation_play"; /* api callbacks */ @@ -2985,8 +2983,8 @@ static void SCREEN_OT_animation_play(wmOperatorType *ot) ot->poll= ED_operator_screenactive_norender; - RNA_def_boolean(ot->srna, "reverse", 0, _("Play in Reverse"), _("Animation is played backwards")); - RNA_def_boolean(ot->srna, "sync", 0, _("Sync"), _("Drop frames to maintain framerate")); + RNA_def_boolean(ot->srna, "reverse", 0, "Play in Reverse", "Animation is played backwards"); + RNA_def_boolean(ot->srna, "sync", 0, "Sync", "Drop frames to maintain framerate"); } static int screen_animation_cancel_exec(bContext *C, wmOperator *op) @@ -3016,8 +3014,8 @@ static int screen_animation_cancel_exec(bContext *C, wmOperator *op) static void SCREEN_OT_animation_cancel(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cancel Animation"); - ot->description= _("Cancel animation, returning to the original frame"); + ot->name= "Cancel Animation"; + ot->description= "Cancel animation, returning to the original frame"; ot->idname= "SCREEN_OT_animation_cancel"; /* api callbacks */ @@ -3025,7 +3023,7 @@ static void SCREEN_OT_animation_cancel(wmOperatorType *ot) ot->poll= ED_operator_screenactive; - RNA_def_boolean(ot->srna, "restore_frame", TRUE, _("Restore Frame"), _("Restore the frame when animation was initialized.")); + RNA_def_boolean(ot->srna, "restore_frame", TRUE, "Restore Frame", "Restore the frame when animation was initialized."); } /* ************** border select operator (template) ***************************** */ @@ -3066,7 +3064,7 @@ static int border_select_do(bContext *C, wmOperator *op) static void SCREEN_OT_border_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border select"); + ot->name= "Border select"; ot->idname= "SCREEN_OT_border_select"; /* api callbacks */ @@ -3112,8 +3110,8 @@ static int fullscreen_back_exec(bContext *C, wmOperator *op) static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Back to Previous Screen"); - ot->description= _("Revert back to the original screen layout, before fullscreen area overlay"); + ot->name= "Back to Previous Screen"; + ot->description= "Revert back to the original screen layout, before fullscreen area overlay"; ot->idname= "SCREEN_OT_back_to_previous"; /* api callbacks */ @@ -3147,8 +3145,8 @@ static int userpref_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *ev static void SCREEN_OT_userpref_show(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Show/Hide User Preferences"); - ot->description= _("Show/hide user preferences"); + ot->name= "Show/Hide User Preferences"; + ot->description= "Show/hide user preferences"; ot->idname= "SCREEN_OT_userpref_show"; /* api callbacks */ @@ -3172,8 +3170,8 @@ static int screen_new_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Screen"); - ot->description= _("Add a new screen"); + ot->name= "New Screen"; + ot->description= "Add a new screen"; ot->idname= "SCREEN_OT_new"; /* api callbacks */ @@ -3198,8 +3196,8 @@ static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Screen"); //was scene - ot->description= _("Delete active screen"); + ot->name= "Delete Screen"; //was scene + ot->description= "Delete active screen"; ot->idname= "SCREEN_OT_delete"; /* api callbacks */ @@ -3245,16 +3243,16 @@ static int scene_new_exec(bContext *C, wmOperator *op) static void SCENE_OT_new(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {SCE_COPY_NEW, "NEW", 0, N_("New"), N_("Add new scene")}, - {SCE_COPY_EMPTY, "EMPTY", 0, N_("Copy Settings"), N_("Make a copy without any objects")}, - {SCE_COPY_LINK_OB, "LINK_OBJECTS", 0, N_("Link Objects"), N_("Link to the objects from the current scene")}, - {SCE_COPY_LINK_DATA, "LINK_OBJECT_DATA", 0, N_("Link Object Data"), N_("Copy objects linked to data from the current scene")}, - {SCE_COPY_FULL, "FULL_COPY", 0, N_("Full Copy"), N_("Make a full copy of the current scene")}, + {SCE_COPY_NEW, "NEW", 0, "New", "Add new scene"}, + {SCE_COPY_EMPTY, "EMPTY", 0, "Copy Settings", "Make a copy without any objects"}, + {SCE_COPY_LINK_OB, "LINK_OBJECTS", 0, "Link Objects", "Link to the objects from the current scene"}, + {SCE_COPY_LINK_DATA, "LINK_OBJECT_DATA", 0, "Link Object Data", "Copy objects linked to data from the current scene"}, + {SCE_COPY_FULL, "FULL_COPY", 0, "Full Copy", "Make a full copy of the current scene"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("New Scene"); - ot->description= _("Add new scene by type"); + ot->name= "New Scene"; + ot->description= "Add new scene by type"; ot->idname= "SCENE_OT_new"; /* api callbacks */ @@ -3265,7 +3263,7 @@ static void SCENE_OT_new(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); } /********************* delete scene operator *********************/ @@ -3282,8 +3280,8 @@ static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void SCENE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Scene"); - ot->description= _("Delete active scene"); + ot->name= "Delete Scene"; + ot->description= "Delete active scene"; ot->idname= "SCENE_OT_delete"; /* api callbacks */ @@ -3351,15 +3349,15 @@ void ED_operatortypes_screen(void) static void keymap_modal_set(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {KM_MODAL_CANCEL, "CANCEL", 0, N_("Cancel"), ""}, - {KM_MODAL_APPLY, "APPLY", 0, N_("Apply"), ""}, - {KM_MODAL_STEP10, "STEP10", 0, N_("Steps on"), ""}, - {KM_MODAL_STEP10_OFF, "STEP10_OFF", 0, N_("Steps off"), ""}, + {KM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, + {KM_MODAL_APPLY, "APPLY", 0, "Apply", ""}, + {KM_MODAL_STEP10, "STEP10", 0, "Steps on", ""}, + {KM_MODAL_STEP10_OFF, "STEP10_OFF", 0, "Steps off", ""}, {0, NULL, 0, NULL, NULL}}; wmKeyMap *keymap; /* Standard Modal keymap ------------------------------------------------ */ - keymap= WM_modalkeymap_add(keyconf, "Standard Modal Map", RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "Standard Modal Map", modal_items); WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, KM_MODAL_CANCEL); WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_ANY, KM_ANY, 0, KM_MODAL_APPLY); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index d9b3961c8b8..3010adafe20 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -38,8 +38,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" @@ -205,7 +203,7 @@ void SCREEN_OT_screenshot(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= _("Save Screenshot"); /* weak: opname starting with 'save' makes filewindow give save-over */ + ot->name= "Save Screenshot"; /* weak: opname starting with 'save' makes filewindow give save-over */ ot->idname= "SCREEN_OT_screenshot"; ot->invoke= screenshot_invoke; @@ -216,7 +214,7 @@ void SCREEN_OT_screenshot(wmOperatorType *ot) ot->flag= 0; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH); - prop= RNA_def_boolean(ot->srna, "full", 1, _("Full Screen"), ""); + prop= RNA_def_boolean(ot->srna, "full", 1, "Full Screen", ""); RNA_def_property_flag(prop, PROP_HIDDEN); /* hide because once the file sel is displayed, the option no longer does anything */ } @@ -377,7 +375,7 @@ static int screencast_exec(bContext *C, wmOperator *op) void SCREEN_OT_screencast(wmOperatorType *ot) { - ot->name= _("Make Screencast"); + ot->name= "Make Screencast"; ot->idname= "SCREEN_OT_screencast"; ot->invoke= WM_operator_confirm; @@ -386,8 +384,8 @@ void SCREEN_OT_screencast(wmOperatorType *ot) ot->flag= 0; - RNA_def_property(ot->srna, _("filepath"), PROP_STRING, PROP_FILEPATH); - RNA_def_boolean(ot->srna, "full", 1, _("Full Screen"), ""); + RNA_def_property(ot->srna, "filepath", PROP_STRING, PROP_FILEPATH); + RNA_def_boolean(ot->srna, "full", 1, "Full Screen", ""); } diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 4438bb4f035..94e08a020f6 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index d581c091db1..b3927fcee68 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') defs = [] -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include' incs += ' ../../gpu ../../makesrna ../../blenloader' diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index bd4f7b79660..79a3251cdf1 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -52,8 +52,6 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "PIL_time.h" #include "IMB_imbuf.h" @@ -4977,7 +4975,7 @@ static int paint_cancel(bContext *C, wmOperator *op) void PAINT_OT_image_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Image Paint"); + ot->name= "Image Paint"; ot->idname= "PAINT_OT_image_paint"; /* api callbacks */ @@ -4991,7 +4989,7 @@ void PAINT_OT_image_paint(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } static int get_imapaint_zoom(bContext *C, float *zoomx, float *zoomy) @@ -5166,7 +5164,7 @@ static int grab_clone_cancel(bContext *UNUSED(C), wmOperator *op) void PAINT_OT_grab_clone(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Grab Clone"); + ot->name= "Grab Clone"; ot->idname= "PAINT_OT_grab_clone"; /* api callbacks */ @@ -5180,7 +5178,7 @@ void PAINT_OT_grab_clone(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_float_vector(ot->srna, "delta", 2, NULL, -FLT_MAX, FLT_MAX, _("Delta"), _("Delta offset of clone image in 0.0..1.0 coordinates."), -1.0f, 1.0f); + RNA_def_float_vector(ot->srna, "delta", 2, NULL, -FLT_MAX, FLT_MAX, "Delta", "Delta offset of clone image in 0.0..1.0 coordinates.", -1.0f, 1.0f); } /******************** sample color operator ********************/ @@ -5248,7 +5246,7 @@ static int image_paint_sample_color_poll(bContext *C) void PAINT_OT_sample_color(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sample Color"); + ot->name= "Sample Color"; ot->idname= "PAINT_OT_sample_color"; /* api callbacks */ @@ -5261,7 +5259,7 @@ void PAINT_OT_sample_color(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, _("Location"), _("Cursor location in region coordinates."), 0, 16384); + RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, "Location", "Cursor location in region coordinates.", 0, 16384); } /******************** set clone cursor operator ********************/ @@ -5299,7 +5297,7 @@ static int set_clone_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) void PAINT_OT_clone_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Clone Cursor"); + ot->name= "Set Clone Cursor"; ot->idname= "PAINT_OT_clone_cursor_set"; /* api callbacks */ @@ -5311,7 +5309,7 @@ void PAINT_OT_clone_cursor_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_vector(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Cursor location in world space coordinates."), -10000.0f, 10000.0f); + RNA_def_float_vector(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in world space coordinates.", -10000.0f, 10000.0f); } /******************** texture paint toggle operator ********************/ @@ -5381,7 +5379,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op) void PAINT_OT_texture_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Texture Paint Toggle"); + ot->name= "Texture Paint Toggle"; ot->idname= "PAINT_OT_texture_paint_toggle"; /* api callbacks */ @@ -5517,9 +5515,9 @@ void PAINT_OT_project_image(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Project Image"); + ot->name= "Project Image"; ot->idname= "PAINT_OT_project_image"; - ot->description= _("Project an edited render from the active camera back onto the object"); + ot->description= "Project an edited render from the active camera back onto the object"; /* api callbacks */ ot->invoke= WM_enum_search_invoke; @@ -5528,7 +5526,7 @@ void PAINT_OT_project_image(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - prop= RNA_def_enum(ot->srna, "image", DummyRNA_NULL_items, 0, _("Image"), ""); + prop= RNA_def_enum(ot->srna, "image", DummyRNA_NULL_items, 0, "Image", ""); RNA_def_enum_funcs(prop, RNA_image_itemf); ot->prop= prop; } @@ -5596,9 +5594,9 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) void PAINT_OT_image_from_view(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Image from View"); + ot->name= "Image from View"; ot->idname= "PAINT_OT_image_from_view"; - ot->description= _("Make an image from the current 3D view for re-projection"); + ot->description= "Make an image from the current 3D view for re-projection"; /* api callbacks */ ot->exec= texture_paint_image_from_view_exec; @@ -5607,5 +5605,5 @@ void PAINT_OT_image_from_view(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER; - RNA_def_string_file_name(ot->srna, "filepath", "", FILE_MAX, _("File Path"), _("Name of the file")); + RNA_def_string_file_name(ot->srna, "filepath", "", FILE_MAX, "File Path", "Name of the file"); } diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index f53bc4208e0..69af50415cc 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -29,8 +29,6 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_brush_types.h" @@ -78,8 +76,8 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op)) static void BRUSH_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Brush"); - ot->description= _("Add brush by mode type"); + ot->name= "Add Brush"; + ot->description= "Add brush by mode type"; ot->idname= "BRUSH_OT_add"; /* api callbacks */ @@ -133,8 +131,8 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op) static void BRUSH_OT_scale_size(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scale Sculpt/Paint Brush Size"); - ot->description= _("Change brush size by a scalar"); + ot->name= "Scale Sculpt/Paint Brush Size"; + ot->description= "Change brush size by a scalar"; ot->idname= "BRUSH_OT_scale_size"; /* api callbacks */ @@ -143,7 +141,7 @@ static void BRUSH_OT_scale_size(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "scalar", 1, 0, 2, _("Scalar"), _("Factor to scale brush size by"), 0, 2); + RNA_def_float(ot->srna, "scalar", 1, 0, 2, "Scalar", "Factor to scale brush size by", 0, 2); } static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op)) @@ -160,7 +158,7 @@ static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op)) static void PAINT_OT_vertex_color_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Vertex Colors"); + ot->name= "Set Vertex Colors"; ot->idname= "PAINT_OT_vertex_color_set"; /* api callbacks */ @@ -189,8 +187,8 @@ static int brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) static void BRUSH_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset Brush"); - ot->description= _("Return brush to defaults based on current tool"); + ot->name= "Reset Brush"; + ot->description= "Return brush to defaults based on current tool"; ot->idname= "BRUSH_OT_reset"; /* api callbacks */ @@ -252,8 +250,8 @@ static int brush_sculpt_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_sculpt_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sculpt Tool Set"); - ot->description= _("Set the sculpt tool"); + ot->name= "Sculpt Tool Set"; + ot->description= "Set the sculpt tool"; ot->idname= "BRUSH_OT_sculpt_tool_set"; /* api callbacks */ @@ -263,7 +261,7 @@ static void BRUSH_OT_sculpt_tool_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "tool", brush_sculpt_tool_items, 0, _("Tool"), ""); + ot->prop= RNA_def_enum(ot->srna, "tool", brush_sculpt_tool_items, 0, "Tool", ""); } static int brush_vertex_tool_set_exec(bContext *C, wmOperator *op) @@ -277,8 +275,8 @@ static int brush_vertex_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_vertex_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Vertex Paint Tool Set"); - ot->description= _("Set the vertex paint tool"); + ot->name= "Vertex Paint Tool Set"; + ot->description= "Set the vertex paint tool"; ot->idname= "BRUSH_OT_vertex_tool_set"; /* api callbacks */ @@ -288,7 +286,7 @@ static void BRUSH_OT_vertex_tool_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, _("Tool"), ""); + ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, "Tool", ""); } static int brush_weight_tool_set_exec(bContext *C, wmOperator *op) @@ -302,8 +300,8 @@ static int brush_weight_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_weight_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Weight Paint Tool Set"); - ot->description= _("Set the weight paint tool"); + ot->name= "Weight Paint Tool Set"; + ot->description= "Set the weight paint tool"; ot->idname= "BRUSH_OT_weight_tool_set"; /* api callbacks */ @@ -313,7 +311,7 @@ static void BRUSH_OT_weight_tool_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, _("Tool"), ""); + ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, "Tool", ""); } static int brush_image_tool_set_exec(bContext *C, wmOperator *op) @@ -327,8 +325,8 @@ static int brush_image_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_image_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Image Paint Tool Set"); - ot->description= _("Set the image tool"); + ot->name= "Image Paint Tool Set"; + ot->description= "Set the image tool"; ot->idname= "BRUSH_OT_image_tool_set"; /* api callbacks */ diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index a1855f254ef..09f5c32bea0 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -15,8 +15,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_DerivedMesh.h" @@ -273,16 +271,16 @@ static int brush_curve_preset_poll(bContext *C) void BRUSH_OT_curve_preset(wmOperatorType *ot) { static EnumPropertyItem prop_shape_items[] = { - {CURVE_PRESET_SHARP, "SHARP", 0, N_("Sharp"), ""}, - {CURVE_PRESET_SMOOTH, "SMOOTH", 0, N_("Smooth"), ""}, - {CURVE_PRESET_MAX, "MAX", 0, N_("Max"), ""}, - {CURVE_PRESET_LINE, "LINE", 0, N_("Line"), ""}, - {CURVE_PRESET_ROUND, "ROUND", 0, N_("Round"), ""}, - {CURVE_PRESET_ROOT, "ROOT", 0, N_("Root"), ""}, + {CURVE_PRESET_SHARP, "SHARP", 0, "Sharp", ""}, + {CURVE_PRESET_SMOOTH, "SMOOTH", 0, "Smooth", ""}, + {CURVE_PRESET_MAX, "MAX", 0, "Max", ""}, + {CURVE_PRESET_LINE, "LINE", 0, "Line", ""}, + {CURVE_PRESET_ROUND, "ROUND", 0, "Round", ""}, + {CURVE_PRESET_ROOT, "ROOT", 0, "Root", ""}, {0, NULL, 0, NULL, NULL}}; - ot->name= _("Preset"); - ot->description= _("Set brush shape"); + ot->name= "Preset"; + ot->description= "Set brush shape"; ot->idname= "BRUSH_OT_curve_preset"; ot->exec= brush_curve_preset_exec; @@ -290,7 +288,7 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "shape", RNA_enum_items_gettexted(prop_shape_items), CURVE_PRESET_SMOOTH, _("Mode"), ""); + RNA_def_enum(ot->srna, "shape", prop_shape_items, CURVE_PRESET_SMOOTH, "Mode", ""); } @@ -304,8 +302,8 @@ static int paint_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_linked(wmOperatorType *ot) { - ot->name= _("Select Linked"); - ot->description= _("Select linked faces"); + ot->name= "Select Linked"; + ot->description= "Select linked faces"; ot->idname= "PAINT_OT_face_select_linked"; ot->exec= paint_select_linked_exec; @@ -324,8 +322,8 @@ static int paint_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent void PAINT_OT_face_select_linked_pick(wmOperatorType *ot) { - ot->name= _("Select Linked Pick"); - ot->description= _("Select linked faces"); + ot->name= "Select Linked Pick"; + ot->description= "Select linked faces"; ot->idname= "PAINT_OT_face_select_linked_pick"; ot->invoke= paint_select_linked_pick_invoke; @@ -333,7 +331,7 @@ void PAINT_OT_face_select_linked_pick(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend the existing selection")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the existing selection"); } @@ -348,8 +346,8 @@ static int face_select_all_exec(bContext *C, wmOperator *op) void PAINT_OT_face_select_all(wmOperatorType *ot) { - ot->name= _("Face Selection"); - ot->description= _("Change selection for all faces"); + ot->name= "Face Selection"; + ot->description= "Change selection for all faces"; ot->idname= "PAINT_OT_face_select_all"; ot->exec= face_select_all_exec; @@ -371,8 +369,8 @@ static int face_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_inverse(wmOperatorType *ot) { - ot->name= _("Face Select Invert"); - ot->description= _("Invert selection of faces"); + ot->name= "Face Select Invert"; + ot->description= "Invert selection of faces"; ot->idname= "PAINT_OT_face_select_inverse"; ot->exec= face_select_inverse_exec; @@ -392,8 +390,8 @@ static int face_select_hide_exec(bContext *C, wmOperator *op) void PAINT_OT_face_select_hide(wmOperatorType *ot) { - ot->name= _("Face Select Hide"); - ot->description= _("Hide selected faces"); + ot->name= "Face Select Hide"; + ot->description= "Hide selected faces"; ot->idname= "PAINT_OT_face_select_hide"; ot->exec= face_select_hide_exec; @@ -401,7 +399,7 @@ void PAINT_OT_face_select_hide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected objects.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects."); } static int face_select_reveal_exec(bContext *C, wmOperator *UNUSED(op)) @@ -414,8 +412,8 @@ static int face_select_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_reveal(wmOperatorType *ot) { - ot->name= _("Face Select Reveal"); - ot->description= _("Reveal hidden faces"); + ot->name= "Face Select Reveal"; + ot->description= "Reveal hidden faces"; ot->idname= "PAINT_OT_face_select_reveal"; ot->exec= face_select_reveal_exec; @@ -423,5 +421,5 @@ void PAINT_OT_face_select_reveal(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected objects.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected objects."); } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 8f4458ff72a..3da19ba7346 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -48,8 +48,6 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLF_api.h" - #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -948,7 +946,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, wmEvent *event) void PAINT_OT_weight_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Weight Paint Sample Weight"); + ot->name= "Weight Paint Sample Weight"; ot->idname= "PAINT_OT_weight_sample"; /* api callbacks */ @@ -1046,7 +1044,7 @@ void PAINT_OT_weight_sample_group(wmOperatorType *ot) PropertyRNA *prop= NULL; /* identifiers */ - ot->name= _("Weight Paint Sample Group"); + ot->name= "Weight Paint Sample Group"; ot->idname= "PAINT_OT_weight_sample_group"; /* api callbacks */ @@ -1058,7 +1056,7 @@ void PAINT_OT_weight_sample_group(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); + prop= RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); RNA_def_enum_funcs(prop, weight_paint_sample_enum_itemf); ot->prop= prop; } @@ -1205,7 +1203,7 @@ void PAINT_OT_weight_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Weight Paint Mode"); + ot->name= "Weight Paint Mode"; ot->idname= "PAINT_OT_weight_paint_toggle"; /* api callbacks */ @@ -1613,7 +1611,7 @@ void PAINT_OT_weight_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Weight Paint"); + ot->name= "Weight Paint"; ot->idname= "PAINT_OT_weight_paint"; /* api callbacks */ @@ -1626,7 +1624,7 @@ void PAINT_OT_weight_paint(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } static int weight_paint_set_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1642,7 +1640,7 @@ static int weight_paint_set_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Weight"); + ot->name= "Set Weight"; ot->idname= "PAINT_OT_weight_set"; /* api callbacks */ @@ -1704,7 +1702,7 @@ void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Vertex Paint Mode"); + ot->name= "Vertex Paint Mode"; ot->idname= "PAINT_OT_vertex_paint_toggle"; /* api callbacks */ @@ -1912,7 +1910,7 @@ static int vpaint_cancel(bContext *C, wmOperator *op) void PAINT_OT_vertex_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Vertex Paint"); + ot->name= "Vertex Paint"; ot->idname= "PAINT_OT_vertex_paint"; /* api callbacks */ @@ -1925,7 +1923,7 @@ void PAINT_OT_vertex_paint(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } /* ********************** weight from bones operator ******************* */ @@ -1956,12 +1954,12 @@ static int weight_from_bones_exec(bContext *C, wmOperator *op) void PAINT_OT_weight_from_bones(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {ARM_GROUPS_AUTO, "AUTOMATIC", 0, N_("Automatic"), N_("Automatic weights froms bones")}, - {ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, N_("From Envelopes"), N_("Weights from envelopes with user defined radius")}, + {ARM_GROUPS_AUTO, "AUTOMATIC", 0, "Automatic", "Automatic weights froms bones"}, + {ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, "From Envelopes", "Weights from envelopes with user defined radius"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Weight from Bones"); + ot->name= "Weight from Bones"; ot->idname= "PAINT_OT_weight_from_bones"; /* api callbacks */ @@ -1973,6 +1971,6 @@ void PAINT_OT_weight_from_bones(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, _("Type"), _("Method to use for assigning weights.")); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Method to use for assigning weights."); } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 170924c400d..92bc60e8b77 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -47,8 +47,6 @@ #include "BLI_editVert.h" #include "BLI_rand.h" -#include "BLF_api.h" - #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" @@ -3540,14 +3538,14 @@ static int sculpt_brush_stroke_cancel(bContext *C, wmOperator *op) static void SCULPT_OT_brush_stroke(wmOperatorType *ot) { static EnumPropertyItem stroke_mode_items[] = { - {BRUSH_STROKE_NORMAL, "NORMAL", 0, N_("Normal"), N_("Apply brush normally")}, - {BRUSH_STROKE_INVERT, "INVERT", 0, N_("Invert"), N_("Invert action of brush for duration of stroke")}, - {BRUSH_STROKE_SMOOTH, "SMOOTH", 0, N_("Smooth"), N_("Switch brush to smooth mode for duration of stroke")}, + {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Normal", "Apply brush normally"}, + {BRUSH_STROKE_INVERT, "INVERT", 0, "Invert", "Invert action of brush for duration of stroke"}, + {BRUSH_STROKE_SMOOTH, "SMOOTH", 0, "Smooth", "Switch brush to smooth mode for duration of stroke"}, {0} }; /* identifiers */ - ot->name= _("Sculpt Mode"); + ot->name= "Sculpt Mode"; ot->idname= "SCULPT_OT_brush_stroke"; /* api callbacks */ @@ -3563,15 +3561,15 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot) /* properties */ RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, - _("Stroke"), ""); + "Stroke", ""); - RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(stroke_mode_items), BRUSH_STROKE_NORMAL, - _("Sculpt Stroke Mode"), - _("Action taken when a sculpt stroke is made")); + RNA_def_enum(ot->srna, "mode", stroke_mode_items, BRUSH_STROKE_NORMAL, + "Sculpt Stroke Mode", + "Action taken when a sculpt stroke is made"); RNA_def_boolean(ot->srna, "ignore_background_click", 0, - _("Ignore Background Click"), - _("Clicks on the background do not start the stroke")); + "Ignore Background Click", + "Clicks on the background do not start the stroke"); } /**** Reset the copy of the mesh that is being sculpted on (currently just for the layer brush) ****/ @@ -3592,7 +3590,7 @@ static int sculpt_set_persistent_base(bContext *C, wmOperator *UNUSED(op)) static void SCULPT_OT_set_persistent_base(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Persistent Base"); + ot->name= "Set Persistent Base"; ot->idname= "SCULPT_OT_set_persistent_base"; /* api callbacks */ @@ -3670,7 +3668,7 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *UNUSED(op)) static void SCULPT_OT_sculptmode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sculpt Mode"); + ot->name= "Sculpt Mode"; ot->idname= "SCULPT_OT_sculptmode_toggle"; /* api callbacks */ diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index a72efadc5df..11da4165ec8 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index e69b27763fd..e17bccdadd9 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' incs += ' ../../makesrna ../../blenloader' incs += ' #/intern/audaspace/intern' diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 85ae788bcdf..19cae6aa67d 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -41,8 +41,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" @@ -180,8 +178,8 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *event) void SOUND_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Open Sound"); - ot->description= _("Load a sound file"); + ot->name= "Open Sound"; + ot->description= "Load a sound file"; ot->idname= "SOUND_OT_open"; /* api callbacks */ @@ -194,15 +192,15 @@ void SOUND_OT_open(wmOperatorType *ot) /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH); - RNA_def_boolean(ot->srna, "cache", FALSE, _("Cache"), _("Cache the sound in memory.")); - RNA_def_boolean(ot->srna, "mono", FALSE, _("Mono"), _("Mixdown the sound to mono.")); + RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory."); + RNA_def_boolean(ot->srna, "mono", FALSE, "Mono", "Mixdown the sound to mono."); } void SOUND_OT_open_mono(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Open Sound Mono"); - ot->description= _("Load a sound file as mono"); + ot->name= "Open Sound Mono"; + ot->description= "Load a sound file as mono"; ot->idname= "SOUND_OT_open_mono"; /* api callbacks */ @@ -215,8 +213,8 @@ void SOUND_OT_open_mono(wmOperatorType *ot) /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH); - RNA_def_boolean(ot->srna, "cache", FALSE, _("Cache"), _("Cache the sound in memory.")); - RNA_def_boolean(ot->srna, "mono", TRUE, _("Mono"), _("Mixdown the sound to mono.")); + RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory."); + RNA_def_boolean(ot->srna, "mono", TRUE, "Mono", "Mixdown the sound to mono."); } /******************** mixdown operator ********************/ @@ -671,8 +669,8 @@ void SOUND_OT_update_animation_flags(wmOperatorType *ot) */ /* identifiers */ - ot->name= _("Update animation"); - ot->description= _("Update animation flags"); + ot->name= "Update animation"; + ot->description= "Update animation flags"; ot->idname= "SOUND_OT_update_animation_flags"; /* api callbacks */ @@ -708,8 +706,8 @@ static int bake_animation_exec(bContext *C, wmOperator *UNUSED(op)) void SOUND_OT_bake_animation(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Update animation cache"); - ot->description= _("Updates the audio animation cache so that it's up to date"); + ot->name= "Update animation cache"; + ot->description= "Updates the audio animation cache so that it's up to date"; ot->idname= "SOUND_OT_bake_animation"; /* api callbacks */ diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index c2e9deca9ac..edebaa8273a 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/space_action/SConscript b/source/blender/editors/space_action/SConscript index e4cec8e70ef..0fee8ff68ab 100644 --- a/source/blender/editors/space_action/SConscript +++ b/source/blender/editors/space_action/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' env.BlenderLib ( 'bf_editors_space_action', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 5ba061f1b80..b5dfdcdc668 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -40,8 +40,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_object_types.h" @@ -126,9 +124,9 @@ static int act_new_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_new (wmOperatorType *ot) { /* identifiers */ - ot->name= _("New Action"); + ot->name= "New Action"; ot->idname= "ACTION_OT_new"; - ot->description= _("Create new action"); + ot->description= "Create new action"; /* api callbacks */ ot->exec= act_new_exec; @@ -209,9 +207,9 @@ static int act_markers_make_local_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_markers_make_local (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Markers Local"); + ot->name= "Make Markers Local"; ot->idname= "ACTION_OT_markers_make_local"; - ot->description= _("Move selected scene markers to the active Action as local 'pose' markers"); + ot->description= "Move selected scene markers to the active Action as local 'pose' markers"; /* callbacks */ ot->exec = act_markers_make_local_exec; @@ -311,9 +309,9 @@ static int actkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Auto-Set Preview Range"); + ot->name= "Auto-Set Preview Range"; ot->idname= "ACTION_OT_previewrange_set"; - ot->description= _("Set Preview Range based on extents of selected Keyframes"); + ot->description= "Set Preview Range based on extents of selected Keyframes"; /* api callbacks */ ot->exec= actkeys_previewrange_exec; @@ -373,9 +371,9 @@ static int actkeys_viewsel_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "ACTION_OT_view_all"; - ot->description= _("Reset viewable area to show full keyframe range"); + ot->description= "Reset viewable area to show full keyframe range"; /* api callbacks */ ot->exec= actkeys_viewall_exec; @@ -388,9 +386,9 @@ void ACTION_OT_view_all (wmOperatorType *ot) void ACTION_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Selected"); + ot->name= "View Selected"; ot->idname= "ACTION_OT_view_selected"; - ot->description= _("Reset viewable area to show selected keyframes range"); + ot->description= "Reset viewable area to show selected keyframes range"; /* api callbacks */ ot->exec= actkeys_viewsel_exec; @@ -474,9 +472,9 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op) void ACTION_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Keyframes"); + ot->name= "Copy Keyframes"; ot->idname= "ACTION_OT_copy"; - ot->description= _("Copy selected keyframes to the copy/paste buffer"); + ot->description= "Copy selected keyframes to the copy/paste buffer"; /* api callbacks */ // ot->invoke= WM_operator_props_popup; // better wait for graph redo panel @@ -525,9 +523,9 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op) void ACTION_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Keyframes"); + ot->name= "Paste Keyframes"; ot->idname= "ACTION_OT_paste"; - ot->description= _("Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"); + ot->description= "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; /* api callbacks */ ot->exec= actkeys_paste_exec; @@ -536,17 +534,17 @@ void ACTION_OT_paste (wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, _("Offset"), _("Paste time offset of keys")); - RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, _("Type"), _("Method of merking pasted keys and existing")); + RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys"); + RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merking pasted keys and existing"); } /* ******************** Insert Keyframes Operator ************************* */ /* defines for insert keyframes tool */ static EnumPropertyItem prop_actkeys_insertkey_types[] = { - {1, "ALL", 0, N_("All Channels"), ""}, - {2, "SEL", 0, N_("Only Selected Channels"), ""}, - {3, "GROUP", 0, N_("In Active Group"), ""}, // xxx not in all cases + {1, "ALL", 0, "All Channels", ""}, + {2, "SEL", 0, "Only Selected Channels", ""}, + {3, "GROUP", 0, "In Active Group", ""}, // xxx not in all cases {0, NULL, 0, NULL, NULL} }; @@ -624,9 +622,9 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op) void ACTION_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert Keyframes"); + ot->name= "Insert Keyframes"; ot->idname= "ACTION_OT_keyframe_insert"; - ot->description= _("Insert keyframes for the specified channels"); + ot->description= "Insert keyframes for the specified channels"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -637,7 +635,7 @@ void ACTION_OT_keyframe_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_insertkey_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_insertkey_types, 0, "Type", ""); } /* ******************** Duplicate Keyframes Operator ************************* */ @@ -699,9 +697,9 @@ static int actkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED void ACTION_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Keyframes"); + ot->name= "Duplicate Keyframes"; ot->idname= "ACTION_OT_duplicate"; - ot->description= _("Make a copy of all selected keyframes"); + ot->description= "Make a copy of all selected keyframes"; /* api callbacks */ ot->invoke= actkeys_duplicate_invoke; @@ -712,7 +710,7 @@ void ACTION_OT_duplicate (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /* ******************** Delete Keyframes Operator ************************* */ @@ -776,9 +774,9 @@ static int actkeys_delete_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Keyframes"); + ot->name= "Delete Keyframes"; ot->idname= "ACTION_OT_delete"; - ot->description= _("Remove all selected keyframes"); + ot->description= "Remove all selected keyframes"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -840,9 +838,9 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op) void ACTION_OT_clean (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clean Keyframes"); + ot->name= "Clean Keyframes"; ot->idname= "ACTION_OT_clean"; - ot->description= _("Simplify F-Curves by removing closely spaced keyframes"); + ot->description= "Simplify F-Curves by removing closely spaced keyframes"; /* api callbacks */ //ot->invoke= // XXX we need that number popup for this! @@ -853,7 +851,7 @@ void ACTION_OT_clean (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, _("Threshold"), "", 0.0f, 1000.0f); + ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); } /* ******************** Sample Keyframes Operator *********************** */ @@ -904,9 +902,9 @@ static int actkeys_sample_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_sample (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sample Keyframes"); + ot->name= "Sample Keyframes"; ot->idname= "ACTION_OT_sample"; - ot->description= _("Add keyframes on every frame between the selected keyframes"); + ot->description= "Add keyframes on every frame between the selected keyframes"; /* api callbacks */ ot->exec= actkeys_sample_exec; @@ -927,11 +925,11 @@ void ACTION_OT_sample (wmOperatorType *ot) /* defines for set extrapolation-type for selected keyframes tool */ static EnumPropertyItem prop_actkeys_expo_types[] = { - {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, N_("Constant Extrapolation"), ""}, - {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, N_("Linear Extrapolation"), ""}, + {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant Extrapolation", ""}, + {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear Extrapolation", ""}, - {MAKE_CYCLIC_EXPO, "MAKE_CYCLIC", 0, N_("Make Cyclic (F-Modifier)"), N_("Add Cycles F-Modifier if one doesn't exist already")}, - {CLEAR_CYCLIC_EXPO, "CLEAR_CYCLIC", 0, N_("Clear Cyclic (F-Modifier)"), N_("Remove Cycles F-Modifier if not needed anymore")}, + {MAKE_CYCLIC_EXPO, "MAKE_CYCLIC", 0, "Make Cyclic (F-Modifier)", "Add Cycles F-Modifier if one doesn't exist already"}, + {CLEAR_CYCLIC_EXPO, "CLEAR_CYCLIC", 0, "Clear Cyclic (F-Modifier)", "Remove Cycles F-Modifier if not needed anymore"}, {0, NULL, 0, NULL, NULL} }; @@ -1014,9 +1012,9 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op) void ACTION_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Extrapolation"); + ot->name= "Set Keyframe Extrapolation"; ot->idname= "ACTION_OT_extrapolation_type"; - ot->description= _("Set extrapolation mode for selected F-Curves"); + ot->description= "Set extrapolation mode for selected F-Curves"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1027,7 +1025,7 @@ void ACTION_OT_extrapolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_expo_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_expo_types, 0, "Type", ""); } /* ******************** Set Interpolation-Type Operator *********************** */ @@ -1085,9 +1083,9 @@ static int actkeys_ipo_exec(bContext *C, wmOperator *op) void ACTION_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Interpolation"); + ot->name= "Set Keyframe Interpolation"; ot->idname= "ACTION_OT_interpolation_type"; - ot->description= _("Set interpolation mode for the F-Curve segments starting from the selected keyframes"); + ot->description= "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1098,7 +1096,7 @@ void ACTION_OT_interpolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(beztriple_interpolation_mode_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); } /* ******************** Set Handle-Type Operator *********************** */ @@ -1165,9 +1163,9 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op) void ACTION_OT_handle_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Handle Type"); + ot->name= "Set Keyframe Handle Type"; ot->idname= "ACTION_OT_handle_type"; - ot->description= _("Set type of handle for selected keyframes"); + ot->description= "Set type of handle for selected keyframes"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1178,7 +1176,7 @@ void ACTION_OT_handle_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(keyframe_handle_type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", keyframe_handle_type_items, 0, "Type", ""); } /* ******************** Set Keyframe-Type Operator *********************** */ @@ -1236,9 +1234,9 @@ static int actkeys_keytype_exec(bContext *C, wmOperator *op) void ACTION_OT_keyframe_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Type"); + ot->name= "Set Keyframe Type"; ot->idname= "ACTION_OT_keyframe_type"; - ot->description= _("Set type of keyframe for the selected keyframes"); + ot->description= "Set type of keyframe for the selected keyframes"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1249,7 +1247,7 @@ void ACTION_OT_keyframe_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(beztriple_keyframe_type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", beztriple_keyframe_type_items, 0, "Type", ""); } /* ************************************************************************** */ @@ -1304,9 +1302,9 @@ static int actkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Jump to Frame"); + ot->name= "Jump to Frame"; ot->idname= "ACTION_OT_frame_jump"; - ot->description= _("Set the current frame to the average frame of the selected keyframes"); + ot->description= "Set the current frame to the average frame of the selected keyframes"; /* api callbacks */ ot->exec= actkeys_framejump_exec; @@ -1320,10 +1318,10 @@ void ACTION_OT_frame_jump (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_actkeys_snap_types[] = { - {ACTKEYS_SNAP_CFRA, "CFRA", 0, N_("Current frame"), ""}, - {ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? - {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? - {ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, + {ACTKEYS_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, + {ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? + {ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? + {ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1400,9 +1398,9 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op) void ACTION_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Snap Keys"); + ot->name= "Snap Keys"; ot->idname= "ACTION_OT_snap"; - ot->description= _("Snap selected keyframes to the times specified"); + ot->description= "Snap selected keyframes to the times specified"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1413,16 +1411,16 @@ void ACTION_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_snap_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_snap_types, 0, "Type", ""); } /* ******************** Mirror Keyframes Operator *********************** */ /* defines for mirror keyframes tool */ static EnumPropertyItem prop_actkeys_mirror_types[] = { - {ACTKEYS_MIRROR_CFRA, "CFRA", 0, N_("By Times over Current frame"), ""}, - {ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, N_("By Values over Value=0"), ""}, - {ACTKEYS_MIRROR_MARKER, "MARKER", 0, N_("By Times over First Selected Marker"), ""}, + {ACTKEYS_MIRROR_CFRA, "CFRA", 0, "By Times over Current frame", ""}, + {ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, "By Values over Value=0", ""}, + {ACTKEYS_MIRROR_MARKER, "MARKER", 0, "By Times over First Selected Marker", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1510,9 +1508,9 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op) void ACTION_OT_mirror (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror Keys"); + ot->name= "Mirror Keys"; ot->idname= "ACTION_OT_mirror"; - ot->description= _("Flip selected keyframes over the selected mirror line"); + ot->description= "Flip selected keyframes over the selected mirror line"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1523,7 +1521,7 @@ void ACTION_OT_mirror (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_actkeys_mirror_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_actkeys_mirror_types, 0, "Type", ""); } /* ************************************************************************** */ diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 8621a56d8f4..491d436741e 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -37,8 +37,6 @@ #include "BLI_blenlib.h" -#include "BLF_api.h" - #include "ED_anim_api.h" #include "ED_markers.h" #include "ED_transform.h" @@ -94,7 +92,7 @@ void ED_operatormacros_action(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if (ot) { WM_operatortype_macro_define(ot, "ACTION_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform"); diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 2d5e56066a7..aa29e54f436 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -39,8 +39,6 @@ #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_gpencil_types.h" #include "DNA_object_types.h" @@ -163,9 +161,9 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op) void ACTION_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select All"); + ot->name= "Select All"; ot->idname= "ACTION_OT_select_all_toggle"; - ot->description= _("Toggle selection of all keyframes"); + ot->description= "Toggle selection of all keyframes"; /* api callbacks */ ot->exec= actkeys_deselectall_exec; @@ -175,7 +173,7 @@ void ACTION_OT_select_all_toggle (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "invert", 0, _("Invert"), ""); + ot->prop= RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Border Select Operator **************************** */ @@ -316,9 +314,9 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op) void ACTION_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); + ot->name= "Border Select"; ot->idname= "ACTION_OT_select_border"; - ot->description= _("Select all keyframes within the specified region"); + ot->description= "Select all keyframes within the specified region"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -334,7 +332,7 @@ void ACTION_OT_select_border(wmOperatorType *ot) /* rna */ WM_operator_properties_gesture_border(ot, FALSE); - ot->prop= RNA_def_boolean(ot->srna, "axis_range", 0, _("Axis Range"), ""); + ot->prop= RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); } /* ******************** Column Select Operator **************************** */ @@ -347,10 +345,10 @@ void ACTION_OT_select_border(wmOperatorType *ot) /* defines for column-select mode */ static EnumPropertyItem prop_column_select_types[] = { - {ACTKEYS_COLUMNSEL_KEYS, "KEYS", 0, N_("On Selected Keyframes"), ""}, - {ACTKEYS_COLUMNSEL_CFRA, "CFRA", 0, N_("On Current Frame"), ""}, - {ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, N_("On Selected Markers"), ""}, - {ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, N_("Between Min/Max Selected Markers"), ""}, + {ACTKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""}, + {ACTKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""}, + {ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""}, + {ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""}, {0, NULL, 0, NULL, NULL} }; @@ -522,9 +520,9 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op) void ACTION_OT_select_column (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select All"); + ot->name= "Select All"; ot->idname= "ACTION_OT_select_column"; - ot->description= _("Select all keyframes on the specified frame(s)"); + ot->description= "Select all keyframes on the specified frame(s)"; /* api callbacks */ ot->exec= actkeys_columnselect_exec; @@ -534,7 +532,7 @@ void ACTION_OT_select_column (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_column_select_types), 0, _("Mode"), ""); + ot->prop= RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); } /* ******************** Select Linked Operator *********************** */ @@ -580,9 +578,9 @@ static int actkeys_select_linked_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_select_linked (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Linked"); + ot->name = "Select Linked"; ot->idname= "ACTION_OT_select_linked"; - ot->description = _("Select keyframes occurring the same F-Curves as selected ones"); + ot->description = "Select keyframes occurring the same F-Curves as selected ones"; /* api callbacks */ ot->exec= actkeys_select_linked_exec; @@ -657,9 +655,9 @@ static int actkeys_select_more_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_select_more (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select More"); + ot->name = "Select More"; ot->idname= "ACTION_OT_select_more"; - ot->description = _("Select keyframes beside already selected ones"); + ot->description = "Select keyframes beside already selected ones"; /* api callbacks */ ot->exec= actkeys_select_more_exec; @@ -691,9 +689,9 @@ static int actkeys_select_less_exec (bContext *C, wmOperator *UNUSED(op)) void ACTION_OT_select_less (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Less"); + ot->name = "Select Less"; ot->idname= "ACTION_OT_select_less"; - ot->description = _("Deselect keyframes on ends of selection islands"); + ot->description = "Deselect keyframes on ends of selection islands"; /* api callbacks */ ot->exec= actkeys_select_less_exec; @@ -708,9 +706,9 @@ void ACTION_OT_select_less (wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_actkeys_leftright_select_types[] = { - {ACTKEYS_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, - {ACTKEYS_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, - {ACTKEYS_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, + {ACTKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, + {ACTKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, + {ACTKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, {0, NULL, 0, NULL, NULL} }; @@ -857,9 +855,9 @@ static int actkeys_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void ACTION_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Left/Right"); + ot->name= "Select Left/Right"; ot->idname= "ACTION_OT_select_leftright"; - ot->description= _("Select keyframes to the left or the right of the current frame"); + ot->description= "Select keyframes to the left or the right of the current frame"; /* api callbacks */ ot->invoke= actkeys_select_leftright_invoke; @@ -870,8 +868,8 @@ void ACTION_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_actkeys_leftright_select_types), ACTKEYS_LRSEL_TEST, _("Mode"), ""); - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); + ot->prop= RNA_def_enum(ot->srna, "mode", prop_actkeys_leftright_select_types, ACTKEYS_LRSEL_TEST, "Mode", ""); + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } /* ******************** Mouse-Click Select Operator *********************** */ @@ -1173,9 +1171,9 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void ACTION_OT_clickselect (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mouse Select Keys"); + ot->name= "Mouse Select Keys"; ot->idname= "ACTION_OT_clickselect"; - ot->description= _("Select keyframes by clicking on them"); + ot->description= "Select keyframes by clicking on them"; /* api callbacks - absolutely no exec() this yet... */ ot->invoke= actkeys_clickselect_invoke; @@ -1185,8 +1183,8 @@ void ACTION_OT_clickselect (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "column", 0, _("Column Select"), ""); // ALTKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "column", 0, "Column Select", ""); // ALTKEY } /* ************************************************************************** */ diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 831461e4b82..4c137c6d886 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -125,24 +125,24 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) #define BUTTON_HEADER_CTX(_ctx, _icon, _tip) \ if(sbuts->pathflag & (1<<_ctx)) { \ - but= uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, _icon, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)_ctx, 0, 0, _tip); \ + but= uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, _icon, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)_ctx, 0, 0, \ + ((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS)) ? BLF_gettext(_tip) : _tip); \ uiButClearFlag(but, UI_BUT_UNDO); \ } \ - - BUTTON_HEADER_CTX(BCONTEXT_RENDER, ICON_SCENE, _("Render")) - BUTTON_HEADER_CTX(BCONTEXT_SCENE, ICON_SCENE_DATA, _("Scene")); - BUTTON_HEADER_CTX(BCONTEXT_WORLD, ICON_WORLD, _("World")); - BUTTON_HEADER_CTX(BCONTEXT_OBJECT, ICON_OBJECT_DATA, _("Object")); - BUTTON_HEADER_CTX(BCONTEXT_CONSTRAINT, ICON_CONSTRAINT, _("Object Constraints")); - BUTTON_HEADER_CTX(BCONTEXT_MODIFIER, ICON_MODIFIER, _("Object Modifiers")); - BUTTON_HEADER_CTX(BCONTEXT_DATA, sbuts->dataicon, _("Object Data")); - BUTTON_HEADER_CTX(BCONTEXT_BONE, ICON_BONE_DATA, _("Bone")); - BUTTON_HEADER_CTX(BCONTEXT_BONE_CONSTRAINT, ICON_CONSTRAINT_BONE, _("Bone Constraints")); - BUTTON_HEADER_CTX(BCONTEXT_MATERIAL, ICON_MATERIAL, _("Material")); - BUTTON_HEADER_CTX(BCONTEXT_TEXTURE, ICON_TEXTURE, _("Textures")); - BUTTON_HEADER_CTX(BCONTEXT_PARTICLE, ICON_PARTICLES, _("Particles")); - BUTTON_HEADER_CTX(BCONTEXT_PHYSICS, ICON_PHYSICS, _("Physics")); + BUTTON_HEADER_CTX(BCONTEXT_RENDER, ICON_SCENE, N_("Render")) + BUTTON_HEADER_CTX(BCONTEXT_SCENE, ICON_SCENE_DATA, N_("Scene")); + BUTTON_HEADER_CTX(BCONTEXT_WORLD, ICON_WORLD, N_("World")); + BUTTON_HEADER_CTX(BCONTEXT_OBJECT, ICON_OBJECT_DATA, N_("Object")); + BUTTON_HEADER_CTX(BCONTEXT_CONSTRAINT, ICON_CONSTRAINT, N_("Object Constraints")); + BUTTON_HEADER_CTX(BCONTEXT_MODIFIER, ICON_MODIFIER, N_("Object Modifiers")); + BUTTON_HEADER_CTX(BCONTEXT_DATA, sbuts->dataicon, N_("Object Data")); + BUTTON_HEADER_CTX(BCONTEXT_BONE, ICON_BONE_DATA, N_("Bone")); + BUTTON_HEADER_CTX(BCONTEXT_BONE_CONSTRAINT, ICON_CONSTRAINT_BONE, N_("Bone Constraints")); + BUTTON_HEADER_CTX(BCONTEXT_MATERIAL, ICON_MATERIAL, N_("Material")); + BUTTON_HEADER_CTX(BCONTEXT_TEXTURE, ICON_TEXTURE, N_("Textures")); + BUTTON_HEADER_CTX(BCONTEXT_PARTICLE, ICON_PARTICLES, N_("Particles")); + BUTTON_HEADER_CTX(BCONTEXT_PHYSICS, ICON_PHYSICS, N_("Physics")); #undef BUTTON_HEADER_CTX diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 346531b2b11..99e5c6d693e 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -43,8 +43,6 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_global.h" #include "BKE_main.h" @@ -85,8 +83,8 @@ static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(e void BUTTONS_OT_toolbox(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toolbox"); - ot->description=_("Display button panel toolbox"); + ot->name= "Toolbox"; + ot->description="Display button panel toolbox"; ot->idname= "BUTTONS_OT_toolbox"; /* api callbacks */ @@ -218,8 +216,8 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event) void BUTTONS_OT_file_browse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Accept"); - ot->description=_("Open a file browser, Hold Shift to open the file, Alt to browse containing directory"); + ot->name= "Accept"; + ot->description="Open a file browser, Hold Shift to open the file, Alt to browse containing directory"; ot->idname= "BUTTONS_OT_file_browse"; /* api callbacks */ @@ -235,8 +233,8 @@ void BUTTONS_OT_file_browse(wmOperatorType *ot) void BUTTONS_OT_directory_browse(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Accept"); - ot->description=_("Open a directory browser, Hold Shift to open the file, Alt to browse containing directory"); + ot->name= "Accept"; + ot->description="Open a directory browser, Hold Shift to open the file, Alt to browse containing directory"; ot->idname= "BUTTONS_OT_directory_browse"; /* api callbacks */ diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index a781c69b5a2..4707baa279b 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -40,8 +40,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_text.h" /* only for character utility funcs */ @@ -350,8 +348,8 @@ static int move_exec(bContext *C, wmOperator *op) void CONSOLE_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Cursor"); - ot->description= _("Move cursor position"); + ot->name= "Move Cursor"; + ot->description= "Move cursor position"; ot->idname= "CONSOLE_OT_move"; /* api callbacks */ @@ -359,7 +357,7 @@ void CONSOLE_OT_move(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, _("Type"), _("Where to move cursor to.")); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to."); } #define TAB_LENGTH 4 @@ -419,8 +417,8 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) void CONSOLE_OT_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert"); - ot->description= _("Insert text at cursor position"); + ot->name= "Insert"; + ot->description= "Insert text at cursor position"; ot->idname= "CONSOLE_OT_insert"; /* api callbacks */ @@ -429,7 +427,7 @@ void CONSOLE_OT_insert(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); + RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); } @@ -488,8 +486,8 @@ static int delete_exec(bContext *C, wmOperator *op) void CONSOLE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); - ot->description= _("Delete text by cursor position"); + ot->name= "Delete"; + ot->description= "Delete text by cursor position"; ot->idname= "CONSOLE_OT_delete"; /* api callbacks */ @@ -497,7 +495,7 @@ void CONSOLE_OT_delete(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, _("Type"), _("Which part of the text to delete.")); + RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete."); } @@ -531,8 +529,8 @@ static int clear_exec(bContext *C, wmOperator *op) void CONSOLE_OT_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear"); - ot->description= _("Clear text by type"); + ot->name= "Clear"; + ot->description= "Clear text by type"; ot->idname= "CONSOLE_OT_clear"; /* api callbacks */ @@ -540,8 +538,8 @@ void CONSOLE_OT_clear(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_boolean(ot->srna, "scrollback", 1, _("Scrollback"), _("Clear the scrollback history")); - RNA_def_boolean(ot->srna, "history", 0, _("History"), _("Clear the command history")); + RNA_def_boolean(ot->srna, "scrollback", 1, "Scrollback", "Clear the scrollback history"); + RNA_def_boolean(ot->srna, "history", 0, "History", "Clear the command history"); } @@ -597,8 +595,8 @@ static int history_cycle_exec(bContext *C, wmOperator *op) void CONSOLE_OT_history_cycle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("History Cycle"); - ot->description= _("Cycle through history"); + ot->name= "History Cycle"; + ot->description= "Cycle through history"; ot->idname= "CONSOLE_OT_history_cycle"; /* api callbacks */ @@ -606,7 +604,7 @@ void CONSOLE_OT_history_cycle(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_boolean(ot->srna, "reverse", 0, _("Reverse"), _("reverse cycle history")); + RNA_def_boolean(ot->srna, "reverse", 0, "Reverse", "reverse cycle history"); } @@ -645,8 +643,8 @@ static int history_append_exec(bContext *C, wmOperator *op) void CONSOLE_OT_history_append(wmOperatorType *ot) { /* identifiers */ - ot->name= _("History Append"); - ot->description= _("Append history at cursor position"); + ot->name= "History Append"; + ot->description= "Append history at cursor position"; ot->idname= "CONSOLE_OT_history_append"; /* api callbacks */ @@ -654,9 +652,9 @@ void CONSOLE_OT_history_append(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); - RNA_def_int(ot->srna, "current_character", 0, 0, INT_MAX, _("Cursor"), _("The index of the cursor."), 0, 10000); - RNA_def_boolean(ot->srna, "remove_duplicates", 0, _("Remove Duplicates"), _("Remove duplicate items in the history")); + RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); + RNA_def_int(ot->srna, "current_character", 0, 0, INT_MAX, "Cursor", "The index of the cursor.", 0, 10000); + RNA_def_boolean(ot->srna, "remove_duplicates", 0, "Remove Duplicates", "Remove duplicate items in the history"); } @@ -699,8 +697,8 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Scrollback Append"); - ot->description= _("Append scrollback text by type"); + ot->name= "Scrollback Append"; + ot->description= "Append scrollback text by type"; ot->idname= "CONSOLE_OT_scrollback_append"; /* api callbacks */ @@ -708,8 +706,8 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot) ot->poll= ED_operator_console_active; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); - RNA_def_enum(ot->srna, "type", console_line_type_items, CONSOLE_LINE_OUTPUT, _("Type"), _("Console output type.")); + RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); + RNA_def_enum(ot->srna, "type", console_line_type_items, CONSOLE_LINE_OUTPUT, "Type", "Console output type."); } @@ -782,8 +780,8 @@ static int copy_exec(bContext *C, wmOperator *UNUSED(op)) void CONSOLE_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy to Clipboard"); - ot->description= _("Copy selected text to clipboard"); + ot->name= "Copy to Clipboard"; + ot->description= "Copy selected text to clipboard"; ot->idname= "CONSOLE_OT_copy"; /* api callbacks */ @@ -833,8 +831,8 @@ static int paste_exec(bContext *C, wmOperator *UNUSED(op)) void CONSOLE_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste from Clipboard"); - ot->description= _("Paste text from clipboard"); + ot->name= "Paste from Clipboard"; + ot->description= "Paste text from clipboard"; ot->idname= "CONSOLE_OT_paste"; /* api callbacks */ @@ -957,9 +955,9 @@ static int console_modal_select_cancel(bContext *C, wmOperator *op) void CONSOLE_OT_select_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Selection"); + ot->name= "Set Selection"; ot->idname= "CONSOLE_OT_select_set"; - ot->description= _("Set the console selection"); + ot->description= "Set the console selection"; /* api callbacks */ ot->invoke= console_modal_select_invoke; diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index f8a5e4ca1ac..1b0893e50e0 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -44,8 +44,6 @@ #include "BLI_winstuff.h" #endif -#include "BLF_api.h" - #include "ED_screen.h" #include "ED_fileselect.h" @@ -296,8 +294,8 @@ static int file_border_select_exec(bContext *C, wmOperator *op) void FILE_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Activate/Select File"); - ot->description= _("Activate/select the file(s) contained in the border"); + ot->name= "Activate/Select File"; + ot->description= "Activate/select the file(s) contained in the border"; ot->idname= "FILE_OT_select_border"; /* api callbacks */ @@ -347,8 +345,8 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void FILE_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Activate/Select File"); - ot->description= _("Activate/select file"); + ot->name= "Activate/Select File"; + ot->description= "Activate/select file"; ot->idname= "FILE_OT_select"; /* api callbacks */ @@ -356,8 +354,8 @@ void FILE_OT_select(wmOperatorType *ot) ot->poll= ED_operator_file_active; /* rna */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend selection instead of deselecting everything first.")); - RNA_def_boolean(ot->srna, "fill", 0, _("Fill"), _("Select everything beginning with the last selection.")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first."); + RNA_def_boolean(ot->srna, "fill", 0, "Fill", "Select everything beginning with the last selection."); } static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op)) @@ -394,8 +392,8 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void FILE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select/Deselect All Files"); - ot->description= _("Select/deselect all files"); + ot->name= "Select/Deselect All Files"; + ot->description= "Select/deselect all files"; ot->idname= "FILE_OT_select_all_toggle"; /* api callbacks */ @@ -431,8 +429,8 @@ static int bookmark_select_exec(bContext *C, wmOperator *op) void FILE_OT_select_bookmark(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Directory"); - ot->description= _("Select a bookmarked directory"); + ot->name= "Select Directory"; + ot->description= "Select a bookmarked directory"; ot->idname= "FILE_OT_select_bookmark"; /* api callbacks */ @@ -464,8 +462,8 @@ static int bookmark_add_exec(bContext *C, wmOperator *UNUSED(op)) void FILE_OT_bookmark_add(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Bookmark"); - ot->description= _("Add a bookmark for the selected/active directory"); + ot->name= "Add Bookmark"; + ot->description= "Add a bookmark for the selected/active directory"; ot->idname= "FILE_OT_bookmark_add"; /* api callbacks */ @@ -497,15 +495,15 @@ static int bookmark_delete_exec(bContext *C, wmOperator *op) void FILE_OT_delete_bookmark(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Bookmark"); - ot->description= _("Delete selected bookmark"); + ot->name= "Delete Bookmark"; + ot->description= "Delete selected bookmark"; ot->idname= "FILE_OT_delete_bookmark"; /* api callbacks */ ot->exec= bookmark_delete_exec; ot->poll= ED_operator_file_active; - RNA_def_int(ot->srna, "index", -1, -1, 20000, _("Index"), "", -1, 20000); + RNA_def_int(ot->srna, "index", -1, -1, 20000, "Index", "", -1, 20000); } int file_hilight_set(SpaceFile *sfile, ARegion *ar, int mx, int my) @@ -559,8 +557,8 @@ static int file_highlight_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *e void FILE_OT_highlight(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Highlight File"); - ot->description= _("Highlight selected file(s)"); + ot->name= "Highlight File"; + ot->description= "Highlight selected file(s)"; ot->idname= "FILE_OT_highlight"; /* api callbacks */ @@ -593,8 +591,8 @@ static int file_operator_poll(bContext *C) void FILE_OT_cancel(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cancel File Load"); - ot->description= _("Cancel loading of selected file"); + ot->name= "Cancel File Load"; + ot->description= "Cancel loading of selected file"; ot->idname= "FILE_OT_cancel"; /* api callbacks */ @@ -761,15 +759,15 @@ int file_exec(bContext *C, wmOperator *exec_op) void FILE_OT_execute(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Execute File Window"); - ot->description= _("Execute selected file"); + ot->name= "Execute File Window"; + ot->description= "Execute selected file"; ot->idname= "FILE_OT_execute"; /* api callbacks */ ot->exec= file_exec; ot->poll= file_operator_poll; - RNA_def_boolean(ot->srna, "need_active", 0, _("Need Active"), _("Only execute if there's an active selected file in the file list.")); + RNA_def_boolean(ot->srna, "need_active", 0, "Need Active", "Only execute if there's an active selected file in the file list."); } @@ -794,8 +792,8 @@ int file_parent_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_parent(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Parent File"); - ot->description= _("Move to parent directory"); + ot->name= "Parent File"; + ot->description= "Move to parent directory"; ot->idname= "FILE_OT_parent"; /* api callbacks */ @@ -819,8 +817,8 @@ static int file_refresh_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_previous(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Previous Folder"); - ot->description= _("Move to previous folder"); + ot->name= "Previous Folder"; + ot->description= "Move to previous folder"; ot->idname= "FILE_OT_previous"; /* api callbacks */ @@ -850,8 +848,8 @@ int file_previous_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_next(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Next Folder"); - ot->description= _("Move to next folder"); + ot->name= "Next Folder"; + ot->description= "Move to next folder"; ot->idname= "FILE_OT_next"; /* api callbacks */ @@ -977,9 +975,9 @@ void FILE_OT_smoothscroll(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Smooth Scroll"); + ot->name= "Smooth Scroll"; ot->idname= "FILE_OT_smoothscroll"; - ot->description=_("Smooth scroll to make editable file visible."); + ot->description="Smooth scroll to make editable file visible."; /* api callbacks */ ot->invoke= file_smoothscroll_invoke; @@ -1064,8 +1062,8 @@ int file_directory_new_exec(bContext *C, wmOperator *op) void FILE_OT_directory_new(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Create New Directory"); - ot->description= _("Create a new directory"); + ot->name= "Create New Directory"; + ot->description= "Create a new directory"; ot->idname= "FILE_OT_directory_new"; /* api callbacks */ @@ -1073,7 +1071,7 @@ void FILE_OT_directory_new(struct wmOperatorType *ot) ot->exec= file_directory_new_exec; ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ - RNA_def_string_dir_path(ot->srna, "directory", "", FILE_MAX, _("Directory"), _("Name of new directory")); + RNA_def_string_dir_path(ot->srna, "directory", "", FILE_MAX, "Directory", "Name of new directory"); } @@ -1179,8 +1177,8 @@ static int file_directory_poll(bContext *C) void FILE_OT_directory(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Enter Directory Name"); - ot->description= _("Enter a directory name"); + ot->name= "Enter Directory Name"; + ot->description= "Enter a directory name"; ot->idname= "FILE_OT_directory"; /* api callbacks */ @@ -1192,8 +1190,8 @@ void FILE_OT_directory(struct wmOperatorType *ot) void FILE_OT_refresh(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Refresh Filelist"); - ot->description= _("Refresh the file list"); + ot->name= "Refresh Filelist"; + ot->description= "Refresh the file list"; ot->idname= "FILE_OT_refresh"; /* api callbacks */ @@ -1218,8 +1216,8 @@ static int file_hidedot_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_hidedot(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Hide Dot Files"); - ot->description= _("Toggle hide hidden dot files"); + ot->name= "Toggle Hide Dot Files"; + ot->description= "Toggle hide hidden dot files"; ot->idname= "FILE_OT_hidedot"; /* api callbacks */ @@ -1268,8 +1266,8 @@ static int file_bookmark_toggle_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_bookmark_toggle(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Bookmarks"); - ot->description= _("Toggle bookmarks display"); + ot->name= "Toggle Bookmarks"; + ot->description= "Toggle bookmarks display"; ot->idname= "FILE_OT_bookmark_toggle"; /* api callbacks */ @@ -1298,8 +1296,8 @@ static int file_filenum_exec(bContext *C, wmOperator *op) void FILE_OT_filenum(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Increment Number in Filename"); - ot->description= _("Increment number in filename"); + ot->name= "Increment Number in Filename"; + ot->description= "Increment number in filename"; ot->idname= "FILE_OT_filenum"; /* api callbacks */ @@ -1307,7 +1305,7 @@ void FILE_OT_filenum(struct wmOperatorType *ot) ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ /* props */ - RNA_def_int(ot->srna, "increment", 1, -100, 100, _("Increment"), "", -100,100); + RNA_def_int(ot->srna, "increment", 1, -100, 100, "Increment", "", -100,100); } static int file_rename_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1352,8 +1350,8 @@ static int file_rename_poll(bContext *C) void FILE_OT_rename(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rename File or Directory"); - ot->description= _("Rename file or file directory"); + ot->name= "Rename File or Directory"; + ot->description= "Rename file or file directory"; ot->idname= "FILE_OT_rename"; /* api callbacks */ @@ -1404,8 +1402,8 @@ int file_delete_exec(bContext *C, wmOperator *UNUSED(op)) void FILE_OT_delete(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete File"); - ot->description= _("Delete selected file"); + ot->name= "Delete File"; + ot->description= "Delete selected file"; ot->idname= "FILE_OT_delete"; /* api callbacks */ diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index f3c38836058..09b90ac4d08 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -207,25 +207,25 @@ void file_panels_register(ARegionType *art) pt= MEM_callocN(sizeof(PanelType), "spacetype file system directories"); strcpy(pt->idname, "FILE_PT_system"); - strcpy(pt->label, _("System")); + strcpy(pt->label, "System"); pt->draw= file_panel_system; BLI_addtail(&art->paneltypes, pt); pt= MEM_callocN(sizeof(PanelType), "spacetype file bookmarks"); strcpy(pt->idname, "FILE_PT_bookmarks"); - strcpy(pt->label, _("Bookmarks")); + strcpy(pt->label, "Bookmarks"); pt->draw= file_panel_bookmarks; BLI_addtail(&art->paneltypes, pt); pt= MEM_callocN(sizeof(PanelType), "spacetype file recent directories"); strcpy(pt->idname, "FILE_PT_recent"); - strcpy(pt->label, _("Recent")); + strcpy(pt->label, "Recent"); pt->draw= file_panel_recent; BLI_addtail(&art->paneltypes, pt); pt= MEM_callocN(sizeof(PanelType), "spacetype file operator properties"); strcpy(pt->idname, "FILE_PT_operator"); - strcpy(pt->label, _("Operator")); + strcpy(pt->label, "Operator"); pt->poll= file_panel_operator_poll; pt->draw_header= file_panel_operator_header; pt->draw= file_panel_operator; diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 1397a5ada94..c7459e8c6b4 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -826,9 +826,9 @@ static int graph_properties(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); + ot->name= "Properties"; ot->idname= "GRAPH_OT_properties"; - ot->description= _("Toggle display properties panel"); + ot->description= "Toggle display properties panel"; ot->exec= graph_properties; ot->poll= ED_operator_graphedit_active; diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index c3a0069a1a1..900aa6f6197 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -47,8 +47,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -186,9 +184,9 @@ static int graphkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Auto-Set Preview Range"); + ot->name= "Auto-Set Preview Range"; ot->idname= "GRAPH_OT_previewrange_set"; - ot->description= _("Automatically set Preview Range based on range of keyframes"); + ot->description= "Automatically set Preview Range based on range of keyframes"; /* api callbacks */ ot->exec= graphkeys_previewrange_exec; @@ -248,9 +246,9 @@ static int graphkeys_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "GRAPH_OT_view_all"; - ot->description= _("Reset viewable area to show full keyframe range"); + ot->description= "Reset viewable area to show full keyframe range"; /* api callbacks */ ot->exec= graphkeys_viewall_exec; @@ -263,9 +261,9 @@ void GRAPH_OT_view_all (wmOperatorType *ot) void GRAPH_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Selected"); + ot->name= "View Selected"; ot->idname= "GRAPH_OT_view_selected"; - ot->description= _("Reset viewable area to show selected keyframe range"); + ot->description= "Reset viewable area to show selected keyframe range"; /* api callbacks */ ot->exec= graphkeys_view_selected_exec; @@ -378,9 +376,9 @@ static int graphkeys_create_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op) void GRAPH_OT_ghost_curves_create (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Create Ghost Curves"); + ot->name= "Create Ghost Curves"; ot->idname= "GRAPH_OT_ghost_curves_create"; - ot->description= _("Create snapshot (Ghosts) of selected F-Curves as background aid for active Graph Editor"); + ot->description= "Create snapshot (Ghosts) of selected F-Curves as background aid for active Graph Editor"; /* api callbacks */ ot->exec= graphkeys_create_ghostcurves_exec; @@ -421,9 +419,9 @@ static int graphkeys_clear_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_ghost_curves_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Ghost Curves"); + ot->name= "Clear Ghost Curves"; ot->idname= "GRAPH_OT_ghost_curves_clear"; - ot->description= _("Clear F-Curve snapshots (Ghosts) for active Graph Editor"); + ot->description= "Clear F-Curve snapshots (Ghosts) for active Graph Editor"; /* api callbacks */ ot->exec= graphkeys_clear_ghostcurves_exec; @@ -440,8 +438,8 @@ void GRAPH_OT_ghost_curves_clear (wmOperatorType *ot) /* defines for insert keyframes tool */ static EnumPropertyItem prop_graphkeys_insertkey_types[] = { - {1, "ALL", 0, N_("All Channels"), ""}, - {2, "SEL", 0, N_("Only Selected Channels"), ""}, + {1, "ALL", 0, "All Channels", ""}, + {2, "SEL", 0, "Only Selected Channels", ""}, {0, NULL, 0, NULL, NULL} }; @@ -516,9 +514,9 @@ static int graphkeys_insertkey_exec(bContext *C, wmOperator *op) void GRAPH_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert Keyframes"); + ot->name= "Insert Keyframes"; ot->idname= "GRAPH_OT_keyframe_insert"; - ot->description= _("Insert keyframes for the specified channels"); + ot->description= "Insert keyframes for the specified channels"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -529,7 +527,7 @@ void GRAPH_OT_keyframe_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_insertkey_types), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_insertkey_types, 0, "Type", ""); } /* ******************** Click-Insert Keyframes Operator ************************* */ @@ -623,9 +621,9 @@ static int graphkeys_click_insert_invoke (bContext *C, wmOperator *op, wmEvent * void GRAPH_OT_click_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Click-Insert Keyframes"); + ot->name= "Click-Insert Keyframes"; ot->idname= "GRAPH_OT_click_insert"; - ot->description= _("Insert new keyframe at the cursor position for the active F-Curve"); + ot->description= "Insert new keyframe at the cursor position for the active F-Curve"; /* api callbacks */ ot->invoke= graphkeys_click_insert_invoke; @@ -636,8 +634,8 @@ void GRAPH_OT_click_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "frame", 1.0f, -FLT_MAX, FLT_MAX, _("Frame Number"), _("Frame to insert keyframe on"), 0, 100); - RNA_def_float(ot->srna, "value", 1.0f, -FLT_MAX, FLT_MAX, _("Value"), _("Value for keyframe on"), 0, 100); + RNA_def_float(ot->srna, "frame", 1.0f, -FLT_MAX, FLT_MAX, "Frame Number", "Frame to insert keyframe on", 0, 100); + RNA_def_float(ot->srna, "value", 1.0f, -FLT_MAX, FLT_MAX, "Value", "Value for keyframe on", 0, 100); } /* ******************** Copy/Paste Keyframes Operator ************************* */ @@ -706,9 +704,9 @@ static int graphkeys_copy_exec(bContext *C, wmOperator *op) void GRAPH_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy Keyframes"); + ot->name= "Copy Keyframes"; ot->idname= "GRAPH_OT_copy"; - ot->description= _("Copy selected keyframes to the copy/paste buffer"); + ot->description= "Copy selected keyframes to the copy/paste buffer"; /* api callbacks */ ot->exec= graphkeys_copy_exec; @@ -752,9 +750,9 @@ static int graphkeys_paste_exec(bContext *C, wmOperator *op) void GRAPH_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste Keyframes"); + ot->name= "Paste Keyframes"; ot->idname= "GRAPH_OT_paste"; - ot->description= _("Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"); + ot->description= "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; /* api callbacks */ // ot->invoke= WM_operator_props_popup; // better wait for graph redo panel @@ -764,8 +762,8 @@ void GRAPH_OT_paste (wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, _("Offset"), _("Paste time offset of keys")); - RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, _("Type"), _("Method of merking pasted keys and existing")); + RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys"); + RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merking pasted keys and existing"); } /* ******************** Duplicate Keyframes Operator ************************* */ @@ -821,9 +819,9 @@ static int graphkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void GRAPH_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Keyframes"); + ot->name= "Duplicate Keyframes"; ot->idname= "GRAPH_OT_duplicate"; - ot->description= _("Make a copy of all selected keyframes"); + ot->description= "Make a copy of all selected keyframes"; /* api callbacks */ ot->invoke= graphkeys_duplicate_invoke; @@ -834,7 +832,7 @@ void GRAPH_OT_duplicate (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /* ******************** Delete Keyframes Operator ************************* */ @@ -891,9 +889,9 @@ static int graphkeys_delete_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Keyframes"); + ot->name= "Delete Keyframes"; ot->idname= "GRAPH_OT_delete"; - ot->description= _("Remove all selected keyframes"); + ot->description= "Remove all selected keyframes"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -953,9 +951,9 @@ static int graphkeys_clean_exec(bContext *C, wmOperator *op) void GRAPH_OT_clean (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clean Keyframes"); + ot->name= "Clean Keyframes"; ot->idname= "GRAPH_OT_clean"; - ot->description= _("Simplify F-Curves by removing closely spaced keyframes"); + ot->description= "Simplify F-Curves by removing closely spaced keyframes"; /* api callbacks */ //ot->invoke= // XXX we need that number popup for this! @@ -966,7 +964,7 @@ void GRAPH_OT_clean (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, _("Threshold"), "", 0.0f, 1000.0f); + ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); } /* ******************** Bake F-Curve Operator *********************** */ @@ -1036,9 +1034,9 @@ static int graphkeys_bake_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Bake Curve"); + ot->name= "Bake Curve"; ot->idname= "GRAPH_OT_bake"; - ot->description= _("Bake selected F-Curves to a set of sampled points defining a similar curve"); + ot->description= "Bake selected F-Curves to a set of sampled points defining a similar curve"; /* api callbacks */ ot->invoke= WM_operator_confirm; // FIXME... @@ -1179,9 +1177,9 @@ static int graphkeys_sound_bake_invoke (bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_sound_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Bake Sound to F-Curves"); + ot->name= "Bake Sound to F-Curves"; ot->idname= "GRAPH_OT_sound_bake"; - ot->description= _("Bakes a sound wave to selected F-Curves"); + ot->description= "Bakes a sound wave to selected F-Curves"; /* api callbacks */ ot->invoke= graphkeys_sound_bake_invoke; @@ -1193,15 +1191,15 @@ void GRAPH_OT_sound_bake (wmOperatorType *ot) /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH); - RNA_def_float(ot->srna, "low", 0.0f, 0.0, 100000.0, _("Lowest frequency"), "", 0.1, 1000.00); - RNA_def_float(ot->srna, "high", 100000.0, 0.0, 100000.0, _("Highest frequency"), "", 0.1, 1000.00); - RNA_def_float(ot->srna, "attack", 0.005, 0.0, 2.0, _("Attack time"), "", 0.01, 0.1); - RNA_def_float(ot->srna, "release", 0.2, 0.0, 5.0, _("Release time"), "", 0.01, 0.2); - RNA_def_float(ot->srna, "threshold", 0.0, 0.0, 1.0, _("Threshold"), "", 0.01, 0.1); - RNA_def_boolean(ot->srna, "accumulate", 0, _("Accumulate"), ""); - RNA_def_boolean(ot->srna, "use_additive", 0, _("Additive"), ""); - RNA_def_boolean(ot->srna, "square", 0, _("Square"), ""); - RNA_def_float(ot->srna, "sthreshold", 0.1, 0.0, 1.0, _("Square Threshold"), "", 0.01, 0.1); + RNA_def_float(ot->srna, "low", 0.0f, 0.0, 100000.0, "Lowest frequency", "", 0.1, 1000.00); + RNA_def_float(ot->srna, "high", 100000.0, 0.0, 100000.0, "Highest frequency", "", 0.1, 1000.00); + RNA_def_float(ot->srna, "attack", 0.005, 0.0, 2.0, "Attack time", "", 0.01, 0.1); + RNA_def_float(ot->srna, "release", 0.2, 0.0, 5.0, "Release time", "", 0.01, 0.2); + RNA_def_float(ot->srna, "threshold", 0.0, 0.0, 1.0, "Threshold", "", 0.01, 0.1); + RNA_def_boolean(ot->srna, "accumulate", 0, "Accumulate", ""); + RNA_def_boolean(ot->srna, "use_additive", 0, "Additive", ""); + RNA_def_boolean(ot->srna, "square", 0, "Square", ""); + RNA_def_float(ot->srna, "sthreshold", 0.1, 0.0, 1.0, "Square Threshold", "", 0.01, 0.1); } /* ******************** Sample Keyframes Operator *********************** */ @@ -1253,9 +1251,9 @@ static int graphkeys_sample_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_sample (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sample Keyframes"); + ot->name= "Sample Keyframes"; ot->idname= "GRAPH_OT_sample"; - ot->description= _("Add keyframes on every frame between the selected keyframes"); + ot->description= "Add keyframes on every frame between the selected keyframes"; /* api callbacks */ ot->exec= graphkeys_sample_exec; @@ -1277,8 +1275,8 @@ void GRAPH_OT_sample (wmOperatorType *ot) /* defines for set extrapolation-type for selected keyframes tool */ static EnumPropertyItem prop_graphkeys_expo_types[] = { - {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, N_("Constant Extrapolation"), ""}, - {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, N_("Linear Extrapolation"), ""}, + {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant Extrapolation", ""}, + {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear Extrapolation", ""}, {MAKE_CYCLIC_EXPO, "MAKE_CYCLIC", 0, "Make Cyclic (F-Modifier)", "Add Cycles F-Modifier if one doesn't exist already"}, {CLEAR_CYCLIC_EXPO, "CLEAR_CYCLIC", 0, "Clear Cyclic (F-Modifier)", "Remove Cycles F-Modifier if not needed anymore"}, @@ -1362,9 +1360,9 @@ static int graphkeys_expo_exec(bContext *C, wmOperator *op) void GRAPH_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Extrapolation"); + ot->name= "Set Keyframe Extrapolation"; ot->idname= "GRAPH_OT_extrapolation_type"; - ot->description= _("Set extrapolation mode for selected F-Curves"); + ot->description= "Set extrapolation mode for selected F-Curves"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1375,7 +1373,7 @@ void GRAPH_OT_extrapolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_expo_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_expo_types, 0, "Type", ""); } /* ******************** Set Interpolation-Type Operator *********************** */ @@ -1431,9 +1429,9 @@ static int graphkeys_ipo_exec(bContext *C, wmOperator *op) void GRAPH_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Interpolation"); + ot->name= "Set Keyframe Interpolation"; ot->idname= "GRAPH_OT_interpolation_type"; - ot->description= _("Set interpolation mode for the F-Curve segments starting from the selected keyframes"); + ot->description= "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1444,7 +1442,7 @@ void GRAPH_OT_interpolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); } /* ******************** Set Handle-Type Operator *********************** */ @@ -1508,9 +1506,9 @@ static int graphkeys_handletype_exec(bContext *C, wmOperator *op) void GRAPH_OT_handle_type (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Keyframe Handle Type"); + ot->name= "Set Keyframe Handle Type"; ot->idname= "GRAPH_OT_handle_type"; - ot->description= _("Set type of handle for selected keyframes"); + ot->description= "Set type of handle for selected keyframes"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1521,7 +1519,7 @@ static int graphkeys_handletype_exec(bContext *C, wmOperator *op) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(keyframe_handle_type_items), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", keyframe_handle_type_items, 0, "Type", ""); } /* ************************************************************************** */ @@ -1702,9 +1700,9 @@ static int graphkeys_euler_filter_exec (bContext *C, wmOperator *op) void GRAPH_OT_euler_filter (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Euler Discontinuity Filter"); + ot->name= "Euler Discontinuity Filter"; ot->idname= "GRAPH_OT_euler_filter"; - ot->description= _("Fixes the most common causes of gimbal lock in the selected Euler Rotation F-Curves"); + ot->description= "Fixes the most common causes of gimbal lock in the selected Euler Rotation F-Curves"; /* api callbacks */ ot->exec= graphkeys_euler_filter_exec; @@ -1776,9 +1774,9 @@ static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Jump to Frame"); + ot->name= "Jump to Frame"; ot->idname= "GRAPH_OT_frame_jump"; - ot->description= _("Set the current frame to the average frame of the selected keyframes"); + ot->description= "Set the current frame to the average frame of the selected keyframes"; /* api callbacks */ ot->exec= graphkeys_framejump_exec; @@ -1792,12 +1790,12 @@ void GRAPH_OT_frame_jump (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_graphkeys_snap_types[] = { - {GRAPHKEYS_SNAP_CFRA, "CFRA", 0, N_("Current Frame"), ""}, - {GRAPHKEYS_SNAP_VALUE, "VALUE", 0, N_("Cursor Value"), ""}, - {GRAPHKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? - {GRAPHKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? - {GRAPHKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, - {GRAPHKEYS_SNAP_HORIZONTAL, "HORIZONTAL", 0, N_("Flatten Handles"), ""}, + {GRAPHKEYS_SNAP_CFRA, "CFRA", 0, "Current Frame", ""}, + {GRAPHKEYS_SNAP_VALUE, "VALUE", 0, "Cursor Value", ""}, + {GRAPHKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? + {GRAPHKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? + {GRAPHKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, + {GRAPHKEYS_SNAP_HORIZONTAL, "HORIZONTAL", 0, "Flatten Handles", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1880,9 +1878,9 @@ static int graphkeys_snap_exec(bContext *C, wmOperator *op) void GRAPH_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Snap Keys"); + ot->name= "Snap Keys"; ot->idname= "GRAPH_OT_snap"; - ot->description= _("Snap selected keyframes to the chosen times/values"); + ot->description= "Snap selected keyframes to the chosen times/values"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1893,18 +1891,18 @@ void GRAPH_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_snap_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_snap_types, 0, "Type", ""); } /* ******************** Mirror Keyframes Operator *********************** */ /* defines for mirror keyframes tool */ static EnumPropertyItem prop_graphkeys_mirror_types[] = { - {GRAPHKEYS_MIRROR_CFRA, "CFRA", 0, N_("By Times over Current Frame"), ""}, - {GRAPHKEYS_MIRROR_VALUE, "VALUE", 0, N_("By Values over Cursor Value"), ""}, - {GRAPHKEYS_MIRROR_YAXIS, "YAXIS", 0, N_("By Times over Time=0"), ""}, - {GRAPHKEYS_MIRROR_XAXIS, "XAXIS", 0, N_("By Values over Value=0"), ""}, - {GRAPHKEYS_MIRROR_MARKER, "MARKER", 0, N_("By Times over First Selected Marker"), ""}, + {GRAPHKEYS_MIRROR_CFRA, "CFRA", 0, "By Times over Current Frame", ""}, + {GRAPHKEYS_MIRROR_VALUE, "VALUE", 0, "By Values over Cursor Value", ""}, + {GRAPHKEYS_MIRROR_YAXIS, "YAXIS", 0, "By Times over Time=0", ""}, + {GRAPHKEYS_MIRROR_XAXIS, "XAXIS", 0, "By Values over Value=0", ""}, + {GRAPHKEYS_MIRROR_MARKER, "MARKER", 0, "By Times over First Selected Marker", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1998,9 +1996,9 @@ static int graphkeys_mirror_exec(bContext *C, wmOperator *op) void GRAPH_OT_mirror (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mirror Keys"); + ot->name= "Mirror Keys"; ot->idname= "GRAPH_OT_mirror"; - ot->description= _("Flip selected keyframes over the selected mirror line"); + ot->description= "Flip selected keyframes over the selected mirror line"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -2011,7 +2009,7 @@ void GRAPH_OT_mirror (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_mirror_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_mirror_types, 0, "Type", ""); } /* ******************** Smooth Keyframes Operator *********************** */ @@ -2053,9 +2051,9 @@ static int graphkeys_smooth_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_smooth (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Smooth Keys"); + ot->name= "Smooth Keys"; ot->idname= "GRAPH_OT_smooth"; - ot->description= _("Apply weighted moving means to make selected F-Curves less bumpy"); + ot->description= "Apply weighted moving means to make selected F-Curves less bumpy"; /* api callbacks */ ot->exec= graphkeys_smooth_exec; @@ -2155,9 +2153,9 @@ static int graph_fmodifier_add_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add F-Curve Modifier"); + ot->name= "Add F-Curve Modifier"; ot->idname= "GRAPH_OT_fmodifier_add"; - ot->description= _("Add F-Modifiers to the selected F-Curves"); + ot->description= "Add F-Modifiers to the selected F-Curves"; /* api callbacks */ ot->invoke= graph_fmodifier_add_invoke; @@ -2168,8 +2166,8 @@ void GRAPH_OT_fmodifier_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(fmodifier_type_items), 0, _("Type"), ""); - RNA_def_boolean(ot->srna, "only_active", 1, _("Only Active"), _("Only add F-Modifier to active F-Curve.")); + ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); + RNA_def_boolean(ot->srna, "only_active", 1, "Only Active", "Only add F-Modifier to active F-Curve."); } /* ******************** Copy F-Modifiers Operator *********************** */ @@ -2213,9 +2211,9 @@ static int graph_fmodifier_copy_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy F-Modifiers"); + ot->name= "Copy F-Modifiers"; ot->idname= "GRAPH_OT_fmodifier_copy"; - ot->description= _("Copy the F-Modifier(s) of the active F-Curve."); + ot->description= "Copy the F-Modifier(s) of the active F-Curve."; /* api callbacks */ ot->exec= graph_fmodifier_copy_exec; @@ -2275,9 +2273,9 @@ static int graph_fmodifier_paste_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste F-Modifiers"); + ot->name= "Paste F-Modifiers"; ot->idname= "GRAPH_OT_fmodifier_paste"; - ot->description= _("Add copied F-Modifiers to the selected F-Curves"); + ot->description= "Add copied F-Modifiers to the selected F-Curves"; /* api callbacks */ ot->exec= graph_fmodifier_paste_exec; diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 00b111f49aa..46918407447 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -40,8 +40,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_main.h" #include "BKE_sound.h" @@ -168,9 +166,9 @@ static int graphview_cursor_modal(bContext *C, wmOperator *op, wmEvent *event) static void GRAPH_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Cursor"); + ot->name= "Set Cursor"; ot->idname= "GRAPH_OT_cursor_set"; - ot->description= _("Interactively set the current frame number and value cursor"); + ot->description= "Interactively set the current frame number and value cursor"; /* api callbacks */ ot->exec= graphview_cursor_exec; @@ -182,8 +180,8 @@ static void GRAPH_OT_cursor_set(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING|OPTYPE_UNDO; /* rna */ - RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, _("Frame"), "", MINAFRAME, MAXFRAME); - RNA_def_float(ot->srna, "value", 0, FLT_MIN, FLT_MAX, _("Value"), "", -100.0f, 100.0f); + RNA_def_int(ot->srna, "frame", 0, MINAFRAME, MAXFRAME, "Frame", "", MINAFRAME, MAXFRAME); + RNA_def_float(ot->srna, "value", 0, FLT_MIN, FLT_MAX, "Value", "", -100.0f, 100.0f); } /* Toggle Handles ----------------------------------------------------------------- */ @@ -208,9 +206,9 @@ static int view_toggle_handles_exec (bContext *C, wmOperator *UNUSED(op)) static void GRAPH_OT_view_togglehandles (wmOperatorType *ot) { /* identification */ - ot->name= _("Show/Hide All Handles"); + ot->name= "Show/Hide All Handles"; ot->idname= "GRAPH_OT_handles_view_toggle"; - ot->description= _("Toggle whether handles are drawn on all keyframes that need them"); + ot->description= "Toggle whether handles are drawn on all keyframes that need them"; /* callbacks */ ot->exec= view_toggle_handles_exec; @@ -277,7 +275,7 @@ void ED_operatormacros_graph(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("GRAPH_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("GRAPH_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); if (ot) { WM_operatortype_macro_define(ot, "GRAPH_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform"); diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 5e256e77c0d..b8c5d79df18 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -40,8 +40,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_anim_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" @@ -169,9 +167,9 @@ static int graphkeys_deselectall_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select All"); + ot->name= "Select All"; ot->idname= "GRAPH_OT_select_all_toggle"; - ot->description= _("Toggle selection of all keyframes"); + ot->description= "Toggle selection of all keyframes"; /* api callbacks */ ot->exec= graphkeys_deselectall_exec; @@ -181,7 +179,7 @@ void GRAPH_OT_select_all_toggle (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - ot->prop= RNA_def_boolean(ot->srna, "invert", 0, _("Invert"), ""); + ot->prop= RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Border Select Operator **************************** */ @@ -338,9 +336,9 @@ static int graphkeys_borderselect_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); + ot->name= "Border Select"; ot->idname= "GRAPH_OT_select_border"; - ot->description= _("Select all keyframes within the specified region"); + ot->description= "Select all keyframes within the specified region"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -356,8 +354,8 @@ void GRAPH_OT_select_border(wmOperatorType *ot) /* rna */ WM_operator_properties_gesture_border(ot, FALSE); - ot->prop= RNA_def_boolean(ot->srna, "axis_range", 0, _("Axis Range"), ""); - RNA_def_boolean(ot->srna, "include_handles", 0, _("Include Handles"), _("Are handles tested individually against the selection criteria")); + ot->prop= RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); + RNA_def_boolean(ot->srna, "include_handles", 0, "Include Handles", "Are handles tested individually against the selection criteria"); } /* ******************** Column Select Operator **************************** */ @@ -370,10 +368,10 @@ void GRAPH_OT_select_border(wmOperatorType *ot) /* defines for column-select mode */ static EnumPropertyItem prop_column_select_types[] = { - {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, N_("On Selected Keyframes"), ""}, - {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, N_("On Current Frame"), ""}, - {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, N_("On Selected Markers"), ""}, - {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, N_("Between Min/Max Selected Markers"), ""}, + {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""}, + {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""}, + {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""}, + {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""}, {0, NULL, 0, NULL, NULL} }; @@ -527,9 +525,9 @@ static int graphkeys_columnselect_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_column (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select All"); + ot->name= "Select All"; ot->idname= "GRAPH_OT_select_column"; - ot->description= _("Select all keyframes on the specified frame(s)"); + ot->description= "Select all keyframes on the specified frame(s)"; /* api callbacks */ ot->exec= graphkeys_columnselect_exec; @@ -539,7 +537,7 @@ void GRAPH_OT_select_column (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_column_select_types), 0, _("Mode"), ""); + ot->prop= RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); } /* ******************** Select Linked Operator *********************** */ @@ -585,9 +583,9 @@ static int graphkeys_select_linked_exec (bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_select_linked (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Linked"); + ot->name = "Select Linked"; ot->idname= "GRAPH_OT_select_linked"; - ot->description = _("Select keyframes occurring the same F-Curves as selected ones"); + ot->description = "Select keyframes occurring the same F-Curves as selected ones"; /* api callbacks */ ot->exec= graphkeys_select_linked_exec; @@ -663,9 +661,9 @@ static int graphkeys_select_more_exec (bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_select_more (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select More"); + ot->name = "Select More"; ot->idname= "GRAPH_OT_select_more"; - ot->description = _("Select keyframes beside already selected ones"); + ot->description = "Select keyframes beside already selected ones"; /* api callbacks */ ot->exec= graphkeys_select_more_exec; @@ -697,9 +695,9 @@ static int graphkeys_select_less_exec (bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_select_less (wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Less"); + ot->name = "Select Less"; ot->idname= "GRAPH_OT_select_less"; - ot->description = _("Deselect keyframes on ends of selection islands"); + ot->description = "Deselect keyframes on ends of selection islands"; /* api callbacks */ ot->exec= graphkeys_select_less_exec; @@ -714,9 +712,9 @@ void GRAPH_OT_select_less (wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_graphkeys_leftright_select_types[] = { - {GRAPHKEYS_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, - {GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, - {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, + {GRAPHKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, + {GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, + {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, {0, NULL, 0, NULL, NULL} }; @@ -837,9 +835,9 @@ static int graphkeys_select_leftright_invoke (bContext *C, wmOperator *op, wmEve void GRAPH_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Left/Right"); + ot->name= "Select Left/Right"; ot->idname= "GRAPH_OT_select_leftright"; - ot->description= _("Select keyframes to the left or the right of the current frame"); + ot->description= "Select keyframes to the left or the right of the current frame"; /* api callbacks */ ot->invoke= graphkeys_select_leftright_invoke; @@ -850,8 +848,8 @@ void GRAPH_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_graphkeys_leftright_select_types), GRAPHKEYS_LRSEL_TEST, _("Mode"), ""); - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); + ot->prop= RNA_def_enum(ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", ""); + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } /* ******************** Mouse-Click Select Operator *********************** */ @@ -1330,18 +1328,18 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_clickselect (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mouse Select Keys"); + ot->name= "Mouse Select Keys"; ot->idname= "GRAPH_OT_clickselect"; - ot->description= _("Select keyframes by clicking on them"); + ot->description= "Select keyframes by clicking on them"; /* api callbacks */ ot->invoke= graphkeys_clickselect_invoke; ot->poll= graphop_visible_keyframes_poll; /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); // SHIFTKEY - RNA_def_boolean(ot->srna, "column", 0, _("Column Select"), _("Select all keyframes that occur on the same frame as the one under the mouse")); // ALTKEY - RNA_def_boolean(ot->srna, "curves", 0, _("Only Curves"), _("Select all the keyframes in the curve")); // CTRLKEY + ALTKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "column", 0, "Column Select", "Select all keyframes that occur on the same frame as the one under the mouse"); // ALTKEY + RNA_def_boolean(ot->srna, "curves", 0, "Only Curves", "Select all the keyframes in the curve"); // CTRLKEY + ALTKEY } /* ************************************************************************** */ diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 60b3b3ddce0..4011f038be8 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -47,8 +47,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -865,9 +863,9 @@ static int image_properties(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); + ot->name= "Properties"; ot->idname= "IMAGE_OT_properties"; - ot->description= _("Toggle display properties panel"); + ot->description= "Toggle display properties panel"; ot->exec= image_properties; ot->poll= ED_operator_image_active; @@ -889,9 +887,9 @@ static int image_scopes(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_scopes(wmOperatorType *ot) { - ot->name= _("Scopes"); + ot->name= "Scopes"; ot->idname= "IMAGE_OT_scopes"; - ot->description= _("Toggle display scopes panel"); + ot->description= "Toggle display scopes panel"; ot->exec= image_scopes; ot->poll= ED_operator_image_active; diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index f4427e55a7d..68f9e4d033e 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -41,8 +41,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_object_types.h" #include "DNA_node_types.h" #include "DNA_packedFile_types.h" @@ -290,7 +288,7 @@ static int view_pan_cancel(bContext *C, wmOperator *op) void IMAGE_OT_view_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Pan"); + ot->name= "View Pan"; ot->idname= "IMAGE_OT_view_pan"; /* api callbacks */ @@ -305,7 +303,7 @@ void IMAGE_OT_view_pan(wmOperatorType *ot) /* properties */ RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX, - _("Offset"), _("Offset in floating point units, 1.0 is the width and height of the image."), -FLT_MAX, FLT_MAX); + "Offset", "Offset in floating point units, 1.0 is the width and height of the image.", -FLT_MAX, FLT_MAX); } /********************** view zoom operator *********************/ @@ -421,7 +419,7 @@ static int view_zoom_cancel(bContext *C, wmOperator *op) void IMAGE_OT_view_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Zoom"); + ot->name= "View Zoom"; ot->idname= "IMAGE_OT_view_zoom"; /* api callbacks */ @@ -436,7 +434,7 @@ void IMAGE_OT_view_zoom(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "factor", 0.0f, 0.0f, FLT_MAX, - _("Factor"), _("Zoom factor, values higher than 1.0 zoom in, lower values zoom out."), -FLT_MAX, FLT_MAX); + "Factor", "Zoom factor, values higher than 1.0 zoom in, lower values zoom out.", -FLT_MAX, FLT_MAX); } /********************** NDOF operator *********************/ @@ -542,7 +540,7 @@ static int view_all_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "IMAGE_OT_view_all"; /* api callbacks */ @@ -603,7 +601,7 @@ static int view_selected_poll(bContext *C) void IMAGE_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Center"); + ot->name= "View Center"; ot->idname= "IMAGE_OT_view_selected"; /* api callbacks */ @@ -628,7 +626,7 @@ static int view_zoom_in_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Zoom In"); + ot->name= "View Zoom In"; ot->idname= "IMAGE_OT_view_zoom_in"; /* api callbacks */ @@ -651,7 +649,7 @@ static int view_zoom_out_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_view_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Zoom Out"); + ot->name= "View Zoom Out"; ot->idname= "IMAGE_OT_view_zoom_out"; /* api callbacks */ @@ -689,7 +687,7 @@ static int view_zoom_ratio_exec(bContext *C, wmOperator *op) void IMAGE_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Zoom Ratio"); + ot->name= "View Zoom Ratio"; ot->idname= "IMAGE_OT_view_zoom_ratio"; /* api callbacks */ @@ -698,18 +696,18 @@ void IMAGE_OT_view_zoom_ratio(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "ratio", 0.0f, 0.0f, FLT_MAX, - _("Ratio"), _("Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out."), -FLT_MAX, FLT_MAX); + "Ratio", "Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out.", -FLT_MAX, FLT_MAX); } /**************** load/replace/save callbacks ******************/ /* XXX make dynamic */ static const EnumPropertyItem image_file_type_items[] = { - {R_TARGA, "TARGA", 0, N_("Targa"), ""}, - {R_RAWTGA, "TARGA RAW", 0, N_("Targa Raw"), ""}, + {R_TARGA, "TARGA", 0, "Targa", ""}, + {R_RAWTGA, "TARGA RAW", 0, "Targa Raw", ""}, {R_PNG, "PNG", 0, "PNG", ""}, #ifdef WITH_DDS - {R_DDS, "DDS", 0, N_("DirectDraw Surface"), ""}, + {R_DDS, "DDS", 0, "DirectDraw Surface", ""}, #endif {R_BMP, "BMP", 0, "BMP", ""}, {R_JPEG90, "JPEG", 0, "Jpeg", ""}, @@ -721,10 +719,10 @@ static const EnumPropertyItem image_file_type_items[] = { {R_TIFF, "TIFF", 0, "Tiff", ""}, #endif #ifdef WITH_DDS - {R_RADHDR, "RADIANCE_HDR", 0, N_("Radiance HDR"), ""}, + {R_RADHDR, "RADIANCE_HDR", 0, "Radiance HDR", ""}, #endif #ifdef WITH_CINEON - {R_CINEON, "CINEON", 0, N_("Cineon"), ""}, + {R_CINEON, "CINEON", 0, "Cineon", ""}, {R_DPX, "DPX", 0, "DPX", ""}, #endif #ifdef WITH_OPENEXR @@ -864,8 +862,8 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Open Image"); - ot->description= _("Open image"); + ot->name= "Open Image"; + ot->description= "Open image"; ot->idname= "IMAGE_OT_open"; /* api callbacks */ @@ -923,7 +921,7 @@ static int replace_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_replace(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Replace Image"); + ot->name= "Replace Image"; ot->idname= "IMAGE_OT_replace"; /* api callbacks */ @@ -1195,7 +1193,7 @@ void IMAGE_OT_save_as(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Save As Image"); + ot->name= "Save As Image"; ot->idname= "IMAGE_OT_save_as"; /* api callbacks */ @@ -1210,14 +1208,14 @@ void IMAGE_OT_save_as(wmOperatorType *ot) /* properties */ /* format options */ - RNA_def_enum(ot->srna, "file_format", image_file_type_items, R_PNG, _("File Type"), _("File type to save image as.")); - RNA_def_enum(ot->srna, "color_mode", image_color_mode_items, R_PLANES24, _("Channels"), _("Image channels to save")); - prop= RNA_def_int(ot->srna, "file_quality", 90, 0, 100, _("Quality"), "", 0, 100); + RNA_def_enum(ot->srna, "file_format", image_file_type_items, R_PNG, "File Type", "File type to save image as."); + RNA_def_enum(ot->srna, "color_mode", image_color_mode_items, R_PLANES24, "Channels", "Image channels to save"); + prop= RNA_def_int(ot->srna, "file_quality", 90, 0, 100, "Quality", "", 0, 100); RNA_def_property_subtype(prop, PROP_PERCENTAGE); WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH); - RNA_def_boolean(ot->srna, "copy", 0, _("Copy"), _("Create a new image file without modifying the current image in blender")); + RNA_def_boolean(ot->srna, "copy", 0, "Copy", "Create a new image file without modifying the current image in blender"); } /******************** save image operator ********************/ @@ -1246,7 +1244,7 @@ static int save_exec(bContext *C, wmOperator *op) void IMAGE_OT_save(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Save Image"); + ot->name= "Save Image"; ot->idname= "IMAGE_OT_save"; /* api callbacks */ @@ -1323,7 +1321,7 @@ static int save_sequence_exec(bContext *C, wmOperator *op) void IMAGE_OT_save_sequence(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Save Sequence"); + ot->name= "Save Sequence"; ot->idname= "IMAGE_OT_save_sequence"; /* api callbacks */ @@ -1358,7 +1356,7 @@ static int reload_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reload Image"); + ot->name= "Reload Image"; ot->idname= "IMAGE_OT_reload"; /* api callbacks */ @@ -1440,8 +1438,8 @@ void IMAGE_OT_new(wmOperatorType *ot) static float default_color[4]= {0.0f, 0.0f, 0.0f, 1.0f}; /* identifiers */ - ot->name= _("New Image"); - ot->description= _("Create a new image"); + ot->name= "New Image"; + ot->description= "Create a new image"; ot->idname= "IMAGE_OT_new"; /* api callbacks */ @@ -1452,14 +1450,14 @@ void IMAGE_OT_new(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "name", "untitled", MAX_ID_NAME-2, _("Name"), _("Image datablock name.")); - RNA_def_int(ot->srna, "width", 1024, 1, INT_MAX, _("Width"), _("Image width."), 1, 16384); - RNA_def_int(ot->srna, "height", 1024, 1, INT_MAX, _("Height"), _("Image height."), 1, 16384); - prop= RNA_def_float_color(ot->srna, "color", 4, NULL, 0.0f, FLT_MAX, _("Color"), _("Default fill color."), 0.0f, 1.0f); + RNA_def_string(ot->srna, "name", "untitled", MAX_ID_NAME-2, "Name", "Image datablock name."); + RNA_def_int(ot->srna, "width", 1024, 1, INT_MAX, "Width", "Image width.", 1, 16384); + RNA_def_int(ot->srna, "height", 1024, 1, INT_MAX, "Height", "Image height.", 1, 16384); + prop= RNA_def_float_color(ot->srna, "color", 4, NULL, 0.0f, FLT_MAX, "Color", "Default fill color.", 0.0f, 1.0f); RNA_def_property_float_array_default(prop, default_color); - RNA_def_boolean(ot->srna, "alpha", 1, _("Alpha"), _("Create an image with an alpha channel.")); - RNA_def_boolean(ot->srna, "uv_test_grid", 0, _("UV Test Grid"), _("Fill the image with a grid for UV map testing.")); - RNA_def_boolean(ot->srna, "float", 0, _("32 bit Float"), _("Create image with 32 bit floating point bit depth.")); + RNA_def_boolean(ot->srna, "alpha", 1, "Alpha", "Create an image with an alpha channel."); + RNA_def_boolean(ot->srna, "uv_test_grid", 0, "UV Test Grid", "Fill the image with a grid for UV map testing."); + RNA_def_boolean(ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth."); } /********************* invert operators *********************/ @@ -1530,7 +1528,7 @@ static int image_invert_exec(bContext *C, wmOperator *op) void IMAGE_OT_invert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Invert Channels"); + ot->name= "Invert Channels"; ot->idname= "IMAGE_OT_invert"; /* api callbacks */ @@ -1538,10 +1536,10 @@ void IMAGE_OT_invert(wmOperatorType *ot) ot->poll= image_invert_poll; /* properties */ - RNA_def_boolean(ot->srna, "invert_r", 0, _("Red"), _("Invert Red Channel")); - RNA_def_boolean(ot->srna, "invert_g", 0, _("Green"), _("Invert Green Channel")); - RNA_def_boolean(ot->srna, "invert_b", 0, _("Blue"), _("Invert Blue Channel")); - RNA_def_boolean(ot->srna, "invert_a", 0, _("Alpha"), _("Invert Alpha Channel")); + RNA_def_boolean(ot->srna, "invert_r", 0, "Red", "Invert Red Channel"); + RNA_def_boolean(ot->srna, "invert_g", 0, "Green", "Invert Green Channel"); + RNA_def_boolean(ot->srna, "invert_b", 0, "Blue", "Invert Blue Channel"); + RNA_def_boolean(ot->srna, "invert_a", 0, "Alpha", "Invert Alpha Channel"); /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1617,8 +1615,8 @@ static int pack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void IMAGE_OT_pack(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Pack Image"); - ot->description= _("Pack an image as embedded data into the .blend file"); + ot->name= "Pack Image"; + ot->description= "Pack an image as embedded data into the .blend file"; ot->idname= "IMAGE_OT_pack"; /* api callbacks */ @@ -1629,7 +1627,7 @@ void IMAGE_OT_pack(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "as_png", 0, _("Pack As PNG"), _("Pack image as lossless PNG.")); + RNA_def_boolean(ot->srna, "as_png", 0, "Pack As PNG", "Pack image as lossless PNG."); } /********************* unpack operator *********************/ @@ -1694,8 +1692,8 @@ static int image_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even void IMAGE_OT_unpack(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Unpack Image"); - ot->description= _("Save an image packed in the .blend file to disk"); + ot->name= "Unpack Image"; + ot->description= "Save an image packed in the .blend file to disk"; ot->idname= "IMAGE_OT_unpack"; /* api callbacks */ @@ -1706,8 +1704,8 @@ void IMAGE_OT_unpack(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, _("Method"), _("How to unpack.")); - RNA_def_string(ot->srna, "id", "", MAX_ID_NAME-2, _("Image Name"), _("Image datablock name to unpack.")); /* XXX, weark!, will fail with library, name collisions */ + RNA_def_enum(ot->srna, "method", unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack."); + RNA_def_string(ot->srna, "id", "", MAX_ID_NAME-2, "Image Name", "Image datablock name to unpack."); /* XXX, weark!, will fail with library, name collisions */ } /******************** sample image operator ********************/ @@ -1904,7 +1902,7 @@ static int sample_cancel(bContext *C, wmOperator *op) void IMAGE_OT_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sample Color"); + ot->name= "Sample Color"; ot->idname= "IMAGE_OT_sample"; /* api callbacks */ @@ -2012,7 +2010,7 @@ static int sample_line_invoke(bContext *C, wmOperator *op, wmEvent *event) void IMAGE_OT_sample_line(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sample Line"); + ot->name= "Sample Line"; ot->idname= "IMAGE_OT_sample_line"; /* api callbacks */ @@ -2033,12 +2031,12 @@ void IMAGE_OT_sample_line(wmOperatorType *ot) void IMAGE_OT_curves_point_set(wmOperatorType *ot) { static EnumPropertyItem point_items[]= { - {0, "BLACK_POINT", 0, N_("Black Point"), ""}, - {1, "WHITE_POINT", 0, N_("White Point"), ""}, + {0, "BLACK_POINT", 0, "Black Point", ""}, + {1, "WHITE_POINT", 0, "White Point", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Set Curves Point"); + ot->name= "Set Curves Point"; ot->idname= "IMAGE_OT_curves_point_set"; /* flags */ @@ -2051,7 +2049,7 @@ void IMAGE_OT_curves_point_set(wmOperatorType *ot) ot->poll= space_image_main_area_poll; /* properties */ - RNA_def_enum(ot->srna, "point", RNA_enum_items_gettexted(point_items), 0, _("Point"), _("Set black point or white point for curves.")); + RNA_def_enum(ot->srna, "point", point_items, 0, "Point", "Set black point or white point for curves."); } /******************** record composite operator *********************/ @@ -2192,7 +2190,7 @@ static int record_composite_cancel(bContext *C, wmOperator *op) void IMAGE_OT_record_composite(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Record Composite"); + ot->name= "Record Composite"; ot->idname= "IMAGE_OT_record_composite"; /* api callbacks */ @@ -2247,7 +2245,7 @@ static int cycle_render_slot_exec(bContext *C, wmOperator *op) void IMAGE_OT_cycle_render_slot(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cycle Render Slot"); + ot->name= "Cycle Render Slot"; ot->idname= "IMAGE_OT_cycle_render_slot"; /* api callbacks */ @@ -2257,7 +2255,7 @@ void IMAGE_OT_cycle_render_slot(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "reverse", 0, _("Cycle in Reverse"), ""); + RNA_def_boolean(ot->srna, "reverse", 0, "Cycle in Reverse", ""); } /******************** TODO ********************/ diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 4aeb75eb7cb..e09565d38e9 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -45,8 +45,6 @@ #include "BLI_bpath.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" @@ -213,7 +211,7 @@ static int make_paths_relative_exec(bContext *C, wmOperator *op) void FILE_OT_make_paths_relative(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make All Paths Relative"); + ot->name= "Make All Paths Relative"; ot->idname= "FILE_OT_make_paths_relative"; /* api callbacks */ @@ -245,7 +243,7 @@ static int make_paths_absolute_exec(bContext *C, wmOperator *op) void FILE_OT_make_paths_absolute(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make All Paths Absolute"); + ot->name= "Make All Paths Absolute"; ot->idname= "FILE_OT_make_paths_absolute"; /* api callbacks */ @@ -268,7 +266,7 @@ static int report_missing_files_exec(bContext *UNUSED(C), wmOperator *op) void FILE_OT_report_missing_files(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Report Missing Files"); + ot->name= "Report Missing Files"; ot->idname= "FILE_OT_report_missing_files"; /* api callbacks */ @@ -301,7 +299,7 @@ static int find_missing_files_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void FILE_OT_find_missing_files(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Find Missing Files"); + ot->name= "Find Missing Files"; ot->idname= "FILE_OT_find_missing_files"; /* api callbacks */ @@ -412,7 +410,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm void INFO_OT_reports_display_update(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Update Reports Display"); + ot->name= "Update Reports Display"; ot->idname= "INFO_OT_reports_display_update"; /* api callbacks */ diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index ed8b66ad23a..c8bda434227 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -37,8 +37,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "WM_api.h" @@ -162,7 +160,7 @@ void INFO_OT_select_pick(wmOperatorType *ot) /* ot->flag= OPTYPE_REGISTER; */ /* properties */ - RNA_def_int(ot->srna, "report_index", 0, 0, INT_MAX, _("Report"), _("The index of the report."), 0, INT_MAX); + RNA_def_int(ot->srna, "report_index", 0, 0, INT_MAX, "Report", "The index of the report.", 0, INT_MAX); } diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index beb9f7dc589..1e8a90d0904 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -290,7 +290,7 @@ static void recent_files_menu_register(void) mt= MEM_callocN(sizeof(MenuType), "spacetype info menu recent files"); strcpy(mt->idname, "INFO_MT_file_open_recent"); - strcpy(mt->label, _("Open Recent...")); + strcpy(mt->label, "Open Recent..."); mt->draw= recent_files_menu_draw; WM_menutype_add(mt); } diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index dc2c5cb461a..16e916928a9 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -35,8 +35,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_screen.h" @@ -120,8 +118,8 @@ static int logic_properties(bContext *C, wmOperator *UNUSED(op)) void LOGIC_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); - ot->description= _("Toggle display properties panel"); + ot->name= "Properties"; + ot->description= "Toggle display properties panel"; ot->idname= "LOGIC_OT_properties"; ot->exec= logic_properties; @@ -201,9 +199,9 @@ void LOGIC_OT_links_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= _("Cut links"); + ot->name= "Cut links"; ot->idname= "LOGIC_OT_links_cut"; - ot->description= _("Remove logic brick connections"); + ot->description= "Remove logic brick connections"; ot->invoke= WM_gesture_lines_invoke; ot->modal= WM_gesture_lines_modal; @@ -218,6 +216,6 @@ void LOGIC_OT_links_cut(wmOperatorType *ot) prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); /* internal */ - RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, _("Cursor"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX); } diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index afb5027c81e..d10e47962f9 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -528,9 +528,9 @@ static int nla_properties(bContext *C, wmOperator *UNUSED(op)) void NLA_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); + ot->name= "Properties"; ot->idname= "NLA_OT_properties"; - ot->description= _("Toggle display properties panel"); + ot->description= "Toggle display properties panel"; ot->exec= nla_properties; ot->poll= ED_operator_nla_active; diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index b10af5b573d..8775d256b80 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -43,8 +43,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_animsys.h" #include "BKE_nla.h" #include "BKE_context.h" @@ -346,9 +344,9 @@ static int nlachannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *e void NLA_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mouse Click on NLA Channels"); + ot->name= "Mouse Click on NLA Channels"; ot->idname= "NLA_OT_channels_click"; - ot->description= _("Handle clicks to select NLA channels"); + ot->description= "Handle clicks to select NLA channels"; /* api callbacks */ ot->invoke= nlachannels_mouseclick_invoke; @@ -358,7 +356,7 @@ void NLA_OT_channels_click (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY } /* *********************************************** */ @@ -420,9 +418,9 @@ static int nlaedit_add_tracks_exec (bContext *C, wmOperator *op) void NLA_OT_tracks_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Track(s)"); + ot->name= "Add Track(s)"; ot->idname= "NLA_OT_tracks_add"; - ot->description= _("Add NLA-Tracks above/after the selected tracks"); + ot->description= "Add NLA-Tracks above/after the selected tracks"; /* api callbacks */ ot->exec= nlaedit_add_tracks_exec; @@ -432,7 +430,7 @@ void NLA_OT_tracks_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "above_selected", 0, _("Above Selected"), _("Add a new NLA Track above every existing selected one.")); + RNA_def_boolean(ot->srna, "above_selected", 0, "Above Selected", "Add a new NLA Track above every existing selected one."); } /* ******************** Delete Tracks Operator ***************************** */ @@ -484,9 +482,9 @@ static int nlaedit_delete_tracks_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete_tracks (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Tracks"); + ot->name= "Delete Tracks"; ot->idname= "NLA_OT_delete_tracks"; - ot->description= _("Delete selected NLA-Tracks and the strips they contain"); + ot->description= "Delete selected NLA-Tracks and the strips they contain"; /* api callbacks */ ot->exec= nlaedit_delete_tracks_exec; diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 70333fb00dd..08026e8a1d2 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -44,8 +44,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_action.h" #include "BKE_fcurve.h" #include "BKE_nla.h" @@ -160,9 +158,9 @@ static int nlaedit_enable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_enter (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Enter Tweak Mode"); + ot->name= "Enter Tweak Mode"; ot->idname= "NLA_OT_tweakmode_enter"; - ot->description= _("Enter tweaking mode for the action referenced by the active strip"); + ot->description= "Enter tweaking mode for the action referenced by the active strip"; /* api callbacks */ ot->exec= nlaedit_enable_tweakmode_exec; @@ -225,9 +223,9 @@ static int nlaedit_disable_tweakmode_exec (bContext *C, wmOperator *op) void NLA_OT_tweakmode_exit (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Exit Tweak Mode"); + ot->name= "Exit Tweak Mode"; ot->idname= "NLA_OT_tweakmode_exit"; - ot->description= _("Exit tweaking mode for the action referenced by the active strip"); + ot->description= "Exit tweaking mode for the action referenced by the active strip"; /* api callbacks */ ot->exec= nlaedit_disable_tweakmode_exec; @@ -475,9 +473,9 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Add Action Strip"); + ot->name= "Add Action Strip"; ot->idname= "NLA_OT_actionclip_add"; - ot->description= _("Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track"); + ot->description= "Add an Action-Clip strip (i.e. an NLA Strip referencing an Action) to the active track"; /* api callbacks */ ot->invoke= WM_enum_search_invoke; @@ -489,7 +487,7 @@ void NLA_OT_actionclip_add (wmOperatorType *ot) /* props */ // TODO: this would be nicer as an ID-pointer... - prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, _("Action"), ""); + prop= RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", ""); RNA_def_enum_funcs(prop, RNA_action_itemf); ot->prop= prop; } @@ -600,9 +598,9 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) void NLA_OT_transition_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Transition"); + ot->name= "Add Transition"; ot->idname= "NLA_OT_transition_add"; - ot->description= _("Add a transition strip between two adjacent selected strips"); + ot->description= "Add a transition strip between two adjacent selected strips"; /* api callbacks */ ot->exec= nlaedit_add_transition_exec; @@ -747,9 +745,9 @@ static int nlaedit_add_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Meta-Strips"); + ot->name= "Add Meta-Strips"; ot->idname= "NLA_OT_meta_add"; - ot->description= _("Add new meta-strips incorporating the selected strips"); + ot->description= "Add new meta-strips incorporating the selected strips"; /* api callbacks */ ot->exec= nlaedit_add_meta_exec; @@ -799,9 +797,9 @@ static int nlaedit_remove_meta_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_meta_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Remove Meta-Strips"); + ot->name= "Remove Meta-Strips"; ot->idname= "NLA_OT_meta_remove"; - ot->description= _("Separate out the strips held by the selected meta-strips"); + ot->description= "Separate out the strips held by the selected meta-strips"; /* api callbacks */ ot->exec= nlaedit_remove_meta_exec; @@ -902,9 +900,9 @@ static int nlaedit_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED void NLA_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Strips"); + ot->name= "Duplicate Strips"; ot->idname= "NLA_OT_duplicate"; - ot->description= _("Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"); + ot->description= "Duplicate selected NLA-Strips, adding the new strips in new tracks above the originals"; /* api callbacks */ ot->invoke= nlaedit_duplicate_invoke; @@ -915,7 +913,7 @@ void NLA_OT_duplicate (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /* ******************** Delete Strips Operator ***************************** */ @@ -977,9 +975,9 @@ static int nlaedit_delete_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete Strips"); + ot->name= "Delete Strips"; ot->idname= "NLA_OT_delete"; - ot->description= _("Delete selected strips"); + ot->description= "Delete selected strips"; /* api callbacks */ ot->exec= nlaedit_delete_exec; @@ -1122,9 +1120,9 @@ static int nlaedit_split_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_split (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Split Strips"); + ot->name= "Split Strips"; ot->idname= "NLA_OT_split"; - ot->description= _("Split selected strips at their midpoints"); + ot->description= "Split selected strips at their midpoints"; /* api callbacks */ ot->exec= nlaedit_split_exec; @@ -1175,9 +1173,9 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Bake Strips"); + ot->name= "Bake Strips"; ot->idname= "NLA_OT_bake"; - ot->description= _("Bake all strips of selected AnimData blocks"); + ot->description= "Bake all strips of selected AnimData blocks"; /* api callbacks */ ot->exec= nlaedit_bake_exec; @@ -1237,9 +1235,9 @@ static int nlaedit_toggle_mute_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_mute_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Muting"); + ot->name= "Toggle Muting"; ot->idname= "NLA_OT_mute_toggle"; - ot->description= _("Mute or un-mute selected strips"); + ot->description= "Mute or un-mute selected strips"; /* api callbacks */ ot->exec= nlaedit_toggle_mute_exec; @@ -1395,9 +1393,9 @@ static int nlaedit_swap_exec (bContext *C, wmOperator *op) void NLA_OT_swap (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Swap Strips"); + ot->name= "Swap Strips"; ot->idname= "NLA_OT_swap"; - ot->description= _("Swap order of selected strips within tracks"); + ot->description= "Swap order of selected strips within tracks"; /* api callbacks */ ot->exec= nlaedit_swap_exec; @@ -1469,9 +1467,9 @@ static int nlaedit_move_up_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Strips Up"); + ot->name= "Move Strips Up"; ot->idname= "NLA_OT_move_up"; - ot->description= _("Move selected strips up a track if there's room"); + ot->description= "Move selected strips up a track if there's room"; /* api callbacks */ ot->exec= nlaedit_move_up_exec; @@ -1543,9 +1541,9 @@ static int nlaedit_move_down_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Strips Down"); + ot->name= "Move Strips Down"; ot->idname= "NLA_OT_move_down"; - ot->description= _("Move selected strips down a track if there's room"); + ot->description= "Move selected strips down a track if there's room"; /* api callbacks */ ot->exec= nlaedit_move_down_exec; @@ -1619,9 +1617,9 @@ static int nlaedit_sync_actlen_exec (bContext *C, wmOperator *op) void NLA_OT_action_sync_length (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sync Action Length"); + ot->name= "Sync Action Length"; ot->idname= "NLA_OT_action_sync_length"; - ot->description= _("Synchronise the length of the referenced Action with the lengths used in the strip"); + ot->description= "Synchronise the length of the referenced Action with the lengths used in the strip"; /* api callbacks */ ot->exec= nlaedit_sync_actlen_exec; @@ -1631,7 +1629,7 @@ void NLA_OT_action_sync_length (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_boolean(ot->srna, "active", 1, _("Active Strip Only"), _("Only sync the active length for the active strip.")); + ot->prop= RNA_def_boolean(ot->srna, "active", 1, "Active Strip Only", "Only sync the active length for the active strip."); } /* ******************** Apply Scale Operator ***************************** */ @@ -1719,9 +1717,9 @@ static int nlaedit_apply_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_apply_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Apply Scale"); + ot->name= "Apply Scale"; ot->idname= "NLA_OT_apply_scale"; - ot->description= _("Apply scaling of selected strips to their referenced Actions"); + ot->description= "Apply scaling of selected strips to their referenced Actions"; /* api callbacks */ ot->exec= nlaedit_apply_scale_exec; @@ -1782,9 +1780,9 @@ static int nlaedit_clear_scale_exec (bContext *C, wmOperator *UNUSED(op)) void NLA_OT_clear_scale (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear Scale"); + ot->name= "Clear Scale"; ot->idname= "NLA_OT_clear_scale"; - ot->description= _("Reset scaling of selected strips"); + ot->description= "Reset scaling of selected strips"; /* api callbacks */ ot->exec= nlaedit_clear_scale_exec; @@ -1799,10 +1797,10 @@ void NLA_OT_clear_scale (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_nlaedit_snap_types[] = { - {NLAEDIT_SNAP_CFRA, "CFRA", 0, N_("Current frame"), ""}, - {NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? - {NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? - {NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, + {NLAEDIT_SNAP_CFRA, "CFRA", 0, "Current frame", ""}, + {NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? + {NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? + {NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1923,9 +1921,9 @@ static int nlaedit_snap_exec (bContext *C, wmOperator *op) void NLA_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Snap Strips"); + ot->name= "Snap Strips"; ot->idname= "NLA_OT_snap"; - ot->description= _("Move start of strips to specified time"); + ot->description= "Move start of strips to specified time"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1936,7 +1934,7 @@ void NLA_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_nlaedit_snap_types), 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_nlaedit_snap_types, 0, "Type", ""); } /* *********************************************** */ @@ -2042,9 +2040,9 @@ static int nla_fmodifier_add_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add F-Modifier"); + ot->name= "Add F-Modifier"; ot->idname= "NLA_OT_fmodifier_add"; - ot->description= _("Add F-Modifier of the specified type to the selected NLA-Strips"); + ot->description= "Add F-Modifier of the specified type to the selected NLA-Strips"; /* api callbacks */ ot->invoke= nla_fmodifier_add_invoke; @@ -2055,8 +2053,8 @@ void NLA_OT_fmodifier_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, _("Type"), ""); - RNA_def_boolean(ot->srna, "only_active", 0, _("Only Active"), _("Only add F-Modifier of the specified type to the active strip.")); + ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); + RNA_def_boolean(ot->srna, "only_active", 0, "Only Active", "Only add F-Modifier of the specified type to the active strip."); } /* ******************** Copy F-Modifiers Operator *********************** */ @@ -2106,9 +2104,9 @@ static int nla_fmodifier_copy_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy F-Modifiers"); + ot->name= "Copy F-Modifiers"; ot->idname= "NLA_OT_fmodifier_copy"; - ot->description= _("Copy the F-Modifier(s) of the active NLA-Strip"); + ot->description= "Copy the F-Modifier(s) of the active NLA-Strip"; /* api callbacks */ ot->exec= nla_fmodifier_copy_exec; @@ -2168,9 +2166,9 @@ static int nla_fmodifier_paste_exec(bContext *C, wmOperator *op) void NLA_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste F-Modifiers"); + ot->name= "Paste F-Modifiers"; ot->idname= "NLA_OT_fmodifier_paste"; - ot->description= _("Add copied F-Modifiers to the selected NLA-Strips"); + ot->description= "Add copied F-Modifiers to the selected NLA-Strips"; /* api callbacks */ ot->exec= nla_fmodifier_paste_exec; diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index a613f924b89..e9b45da6bce 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -41,8 +41,6 @@ #include "BLI_math.h" #include "BLI_rand.h" -#include "BLF_api.h" - #include "BKE_nla.h" #include "BKE_context.h" #include "BKE_screen.h" @@ -188,9 +186,9 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op) void NLA_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); + ot->name= "Select or Deselect All"; ot->idname= "NLA_OT_select_all_toggle"; - ot->description= _("(De)Select all NLA-Strips"); + ot->description= "(De)Select all NLA-Strips"; /* api callbacks */ ot->exec= nlaedit_deselectall_exec; @@ -200,7 +198,7 @@ void NLA_OT_select_all_toggle (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - RNA_def_boolean(ot->srna, "invert", 0, _("Invert"), ""); + RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ******************** Border Select Operator **************************** */ @@ -327,9 +325,9 @@ static int nlaedit_borderselect_exec(bContext *C, wmOperator *op) void NLA_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); + ot->name= "Border Select"; ot->idname= "NLA_OT_select_border"; - ot->description= _("Use box selection to grab NLA-Strips"); + ot->description= "Use box selection to grab NLA-Strips"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -345,7 +343,7 @@ void NLA_OT_select_border(wmOperatorType *ot) /* rna */ WM_operator_properties_gesture_border(ot, 0); - RNA_def_boolean(ot->srna, "axis_range", 0, _("Axis Range"), ""); + RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); } /* ******************** Select Left/Right Operator ************************* */ @@ -353,9 +351,9 @@ void NLA_OT_select_border(wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_nlaedit_leftright_select_types[] = { - {NLAEDIT_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, - {NLAEDIT_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, - {NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, + {NLAEDIT_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, + {NLAEDIT_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, + {NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, {0, NULL, 0, NULL, NULL} }; @@ -479,9 +477,9 @@ static int nlaedit_select_leftright_invoke (bContext *C, wmOperator *op, wmEvent void NLA_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Left/Right"); + ot->name= "Select Left/Right"; ot->idname= "NLA_OT_select_leftright"; - ot->description= _("Select strips to the left or the right of the current frame "); + ot->description= "Select strips to the left or the right of the current frame "; /* api callbacks */ ot->invoke= nlaedit_select_leftright_invoke; @@ -492,8 +490,8 @@ void NLA_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_nlaedit_leftright_select_types), NLAEDIT_LRSEL_TEST, _("Mode"), ""); - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); + ot->prop= RNA_def_enum(ot->srna, "mode", prop_nlaedit_leftright_select_types, NLAEDIT_LRSEL_TEST, "Mode", ""); + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); } @@ -641,9 +639,9 @@ static int nlaedit_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even void NLA_OT_click_select (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mouse Select"); + ot->name= "Mouse Select"; ot->idname= "NLA_OT_click_select"; - ot->description= _("Handle clicks to select NLA Strips"); + ot->description= "Handle clicks to select NLA Strips"; /* api callbacks - absolutely no exec() this yet... */ ot->invoke= nlaedit_clickselect_invoke; @@ -653,7 +651,7 @@ void NLA_OT_click_select (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); // SHIFTKEY + RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", ""); // SHIFTKEY } /* *********************************************** */ diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 95a58402b0a..7b14e35e8fe 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -46,8 +46,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_node.h" #include "BKE_screen.h" @@ -166,8 +164,8 @@ static int node_properties_poll(bContext *C) void NODE_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); - ot->description= _("Toggles the properties panel display"); + ot->name= "Properties"; + ot->description= "Toggles the properties panel display"; ot->idname= "NODE_OT_properties"; ot->exec= node_properties; diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 2bec199fe3b..5f58f540aae 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -52,8 +52,6 @@ #include "BLI_storage_types.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_global.h" @@ -100,8 +98,8 @@ #include "node_intern.h" static EnumPropertyItem socket_in_out_items[] = { - { SOCK_IN, "SOCK_IN", 0, N_("Input"), "" }, - { SOCK_OUT, "SOCK_OUT", 0, N_("Output"), "" }, + { SOCK_IN, "SOCK_IN", 0, "Input", "" }, + { SOCK_OUT, "SOCK_OUT", 0, "Output", "" }, { 0, NULL, 0, NULL, NULL }, }; @@ -882,8 +880,8 @@ static int node_group_edit_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void NODE_OT_group_edit(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Edit Group"); - ot->description = _("Edit node group"); + ot->name = "Edit Group"; + ot->description = "Edit node group"; ot->idname = "NODE_OT_group_edit"; /* api callbacks */ @@ -932,8 +930,8 @@ static int node_group_socket_add_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_add(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Add Group Socket"); - ot->description = _("Add node group socket"); + ot->name = "Add Group Socket"; + ot->description = "Add node group socket"; ot->idname = "NODE_OT_group_socket_add"; /* api callbacks */ @@ -943,9 +941,9 @@ void NODE_OT_group_socket_add(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, _("Socket Type"), _("Input or Output")); - RNA_def_string(ot->srna, "name", "", 32, _("Name"), _("Group socket name")); - RNA_def_enum(ot->srna, "type", node_socket_type_items, SOCK_FLOAT, _("Type"), _("Type of the group socket")); + RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, "Socket Type", "Input or Output"); + RNA_def_string(ot->srna, "name", "", 32, "Name", "Group socket name"); + RNA_def_enum(ot->srna, "type", node_socket_type_items, SOCK_FLOAT, "Type", "Type of the group socket"); } /* ***************** Remove Group Socket operator ************* */ @@ -984,8 +982,8 @@ static int node_group_socket_remove_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_remove(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Remove Group Socket"); - ot->description = _("Removed node group socket"); + ot->name = "Remove Group Socket"; + ot->description = "Removed node group socket"; ot->idname = "NODE_OT_group_socket_remove"; /* api callbacks */ @@ -995,8 +993,8 @@ void NODE_OT_group_socket_remove(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), "", 0, INT_MAX); - RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, _("Socket Type"), _("Input or Output")); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, INT_MAX); + RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, "Socket Type", "Input or Output"); } /* ***************** Move Group Socket Up operator ************* */ @@ -1054,8 +1052,8 @@ static int node_group_socket_move_up_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_move_up(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Move Group Socket Up"); - ot->description = _("Move up node group socket"); + ot->name = "Move Group Socket Up"; + ot->description = "Move up node group socket"; ot->idname = "NODE_OT_group_socket_move_up"; /* api callbacks */ @@ -1065,8 +1063,8 @@ void NODE_OT_group_socket_move_up(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), "", 0, INT_MAX); - RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, _("Socket Type"), _("Input or Output")); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, INT_MAX); + RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, "Socket Type", "Input or Output"); } /* ***************** Move Group Socket Up operator ************* */ @@ -1124,8 +1122,8 @@ static int node_group_socket_move_down_exec(bContext *C, wmOperator *op) void NODE_OT_group_socket_move_down(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Move Group Socket Down"); - ot->description = _("Move down node group socket"); + ot->name = "Move Group Socket Down"; + ot->description = "Move down node group socket"; ot->idname = "NODE_OT_group_socket_move_down"; /* api callbacks */ @@ -1135,8 +1133,8 @@ void NODE_OT_group_socket_move_down(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), "", 0, INT_MAX); - RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, _("Socket Type"), _("Input or Output")); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, INT_MAX); + RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, "Socket Type", "Input or Output"); } /* ******************** Ungroup operator ********************** */ @@ -1175,8 +1173,8 @@ static int node_group_ungroup_exec(bContext *C, wmOperator *op) void NODE_OT_group_ungroup(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Ungroup"); - ot->description = _("Ungroup selected nodes"); + ot->name = "Ungroup"; + ot->description = "Ungroup selected nodes"; ot->idname = "NODE_OT_group_ungroup"; /* api callbacks */ @@ -1291,8 +1289,8 @@ static int snode_bg_viewmove_cancel(bContext *UNUSED(C), wmOperator *op) void NODE_OT_backimage_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Background Image Move"); - ot->description = _("Move Node backdrop"); + ot->name= "Background Image Move"; + ot->description = "Move Node backdrop"; ot->idname= "NODE_OT_backimage_move"; /* api callbacks */ @@ -1322,7 +1320,7 @@ void NODE_OT_backimage_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Background Image Zoom"); + ot->name= "Background Image Zoom"; ot->idname= "NODE_OT_backimage_zoom"; /* api callbacks */ @@ -1333,7 +1331,7 @@ void NODE_OT_backimage_zoom(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* internal */ - RNA_def_float(ot->srna, "factor", 1.2f, 0.0f, 10.0f, _("Factor"), "", 0.0f, 10.0f); + RNA_def_float(ot->srna, "factor", 1.2f, 0.0f, 10.0f, "Factor", "", 0.0f, 10.0f); } /******************** sample backdrop operator ********************/ @@ -1485,7 +1483,7 @@ static int sample_cancel(bContext *C, wmOperator *op) void NODE_OT_backimage_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Backimage Sample"); + ot->name= "Backimage Sample"; ot->idname= "NODE_OT_backimage_sample"; /* api callbacks */ @@ -1596,7 +1594,7 @@ static int node_resize_cancel(bContext *UNUSED(C), wmOperator *op) void NODE_OT_resize(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Resize Node"); + ot->name= "Resize Node"; ot->idname= "NODE_OT_resize"; /* api callbacks */ @@ -1803,8 +1801,8 @@ static int node_active_link_viewer(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_link_viewer(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Link to Viewer Node"); - ot->description = _("Link to Viewer Node"); + ot->name= "Link to Viewer Node"; + ot->description = "Link to Viewer Node"; ot->idname= "NODE_OT_link_viewer"; /* api callbacks */ @@ -2273,8 +2271,8 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) void NODE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Nodes"); - ot->description = _("Duplicate the nodes"); + ot->name= "Duplicate Nodes"; + ot->description = "Duplicate the nodes"; ot->idname= "NODE_OT_duplicate"; /* api callbacks */ @@ -2284,7 +2282,7 @@ void NODE_OT_duplicate(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "keep_inputs", 0, _("Keep Inputs"), _("Keep the input links to duplicated nodes")); + RNA_def_boolean(ot->srna, "keep_inputs", 0, "Keep Inputs", "Keep the input links to duplicated nodes"); } /* *************************** add link op ******************** */ @@ -2567,7 +2565,7 @@ static int node_link_cancel(bContext *C, wmOperator *op) void NODE_OT_link(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Link Nodes"); + ot->name= "Link Nodes"; ot->idname= "NODE_OT_link"; /* api callbacks */ @@ -2603,8 +2601,8 @@ static int node_make_link_exec(bContext *C, wmOperator *op) void NODE_OT_link_make(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Links"); - ot->description= _("Makes a link between selected output in input sockets"); + ot->name= "Make Links"; + ot->description= "Makes a link between selected output in input sockets"; ot->idname= "NODE_OT_link_make"; /* callbacks */ @@ -2614,7 +2612,7 @@ void NODE_OT_link_make(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "replace", 0, _("Replace"), _("Replace socket connections with the new links")); + RNA_def_boolean(ot->srna, "replace", 0, "Replace", "Replace socket connections with the new links"); } /* ********************** Cut Link operator ***************** */ @@ -2681,7 +2679,7 @@ void NODE_OT_links_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= _("Cut links"); + ot->name= "Cut links"; ot->idname= "NODE_OT_links_cut"; ot->invoke= WM_gesture_lines_invoke; @@ -2697,7 +2695,7 @@ void NODE_OT_links_cut(wmOperatorType *ot) prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); /* internal */ - RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, _("Cursor"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX); } /* ********************* automatic node insert on dragging ******************* */ @@ -2883,7 +2881,7 @@ static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_read_renderlayers(wmOperatorType *ot) { - ot->name= _("Read Render Layers"); + ot->name= "Read Render Layers"; ot->idname= "NODE_OT_read_renderlayers"; ot->exec= node_read_renderlayers_exec; @@ -2915,7 +2913,7 @@ static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_read_fullsamplelayers(wmOperatorType *ot) { - ot->name= _("Read Full Sample Layers"); + ot->name= "Read Full Sample Layers"; ot->idname= "NODE_OT_read_fullsamplelayers"; ot->exec= node_read_fullsamplelayers_exec; @@ -2963,7 +2961,7 @@ int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_render_changed(wmOperatorType *ot) { - ot->name= _("Render Changed Layer"); + ot->name= "Render Changed Layer"; ot->idname= "NODE_OT_render_changed"; ot->exec= node_render_changed_exec; @@ -3022,8 +3020,8 @@ static int node_group_make_exec(bContext *C, wmOperator *op) void NODE_OT_group_make(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Group"); - ot->description = _("Make group from selected nodes"); + ot->name = "Group"; + ot->description = "Make group from selected nodes"; ot->idname = "NODE_OT_group_make"; /* api callbacks */ @@ -3085,8 +3083,8 @@ static int node_hide_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_hide_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide"); - ot->description= _("Toggle hiding of selected nodes"); + ot->name= "Hide"; + ot->description= "Toggle hiding of selected nodes"; ot->idname= "NODE_OT_hide_toggle"; /* callbacks */ @@ -3117,8 +3115,8 @@ static int node_preview_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_preview_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Node Preview"); - ot->description= _("Toggle preview display for selected nodes"); + ot->name= "Toggle Node Preview"; + ot->description= "Toggle preview display for selected nodes"; ot->idname= "NODE_OT_preview_toggle"; /* callbacks */ @@ -3166,8 +3164,8 @@ static int node_socket_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_hide_socket_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Hidden Node Sockets"); - ot->description= _("Toggle unused node socket display"); + ot->name= "Toggle Hidden Node Sockets"; + ot->description= "Toggle unused node socket display"; ot->idname= "NODE_OT_hide_socket_toggle"; /* callbacks */ @@ -3209,8 +3207,8 @@ static int node_mute_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_mute_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Node Mute"); - ot->description= _("Toggle muting of the nodes"); + ot->name= "Toggle Node Mute"; + ot->description= "Toggle muting of the nodes"; ot->idname= "NODE_OT_mute_toggle"; /* callbacks */ @@ -3251,8 +3249,8 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); - ot->description = _("Delete selected nodes"); + ot->name= "Delete"; + ot->description = "Delete selected nodes"; ot->idname= "NODE_OT_delete"; /* api callbacks */ @@ -3428,8 +3426,8 @@ static int node_show_cycles_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_show_cyclic_dependencies(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Show Cyclic Dependencies"); - ot->description= _("Sort the nodes and show the cyclic dependencies between the nodes"); + ot->name= "Show Cyclic Dependencies"; + ot->description= "Sort the nodes and show the cyclic dependencies between the nodes"; ot->idname= "NODE_OT_show_cyclic_dependencies"; /* callbacks */ @@ -3523,8 +3521,8 @@ static int node_add_file_invoke(bContext *C, wmOperator *op, wmEvent *event) void NODE_OT_add_file(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add File Node"); - ot->description= _("Add a file node to the current node editor"); + ot->name= "Add File Node"; + ot->description= "Add a file node to the current node editor"; ot->idname= "NODE_OT_add_file"; /* callbacks */ @@ -3536,7 +3534,7 @@ void NODE_OT_add_file(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH); //XXX TODO, relative_path - RNA_def_string(ot->srna, "name", "Image", 24, _("Name"), _("Datablock name to assign.")); + RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Datablock name to assign."); } /********************** New node tree operator *********************/ diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index 7cb3a27d00a..6eccaa2e274 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -267,7 +267,7 @@ void node_menus_register(void) mt= MEM_callocN(sizeof(MenuType), "spacetype node menu add"); strcpy(mt->idname, "NODE_MT_add"); - strcpy(mt->label, _("Add")); + strcpy(mt->label, "Add"); mt->draw= node_menu_add; WM_menutype_add(mt); } diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 849e67e0431..153d703ddf6 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -42,8 +42,6 @@ #include "RNA_access.h" -#include "BLF_api.h" - #include "WM_api.h" #include "WM_types.h" @@ -107,17 +105,17 @@ void ED_operatormacros_node(void) wmOperatorType *ot; wmOperatorTypeMacro *mot; - ot= WM_operatortype_append_macro("NODE_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("NODE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); WM_operatortype_macro_define(ot, "NODE_OT_duplicate"); WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); /* modified operator call for duplicating with input links */ - ot= WM_operatortype_append_macro("NODE_OT_duplicate_move_keep_inputs", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("NODE_OT_duplicate_move_keep_inputs", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); mot = WM_operatortype_macro_define(ot, "NODE_OT_duplicate"); RNA_boolean_set(mot->ptr, "keep_inputs", 1); WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); - ot= WM_operatortype_append_macro("NODE_OT_select_link_viewer", _("Link Viewer"), OPTYPE_UNDO); + ot= WM_operatortype_append_macro("NODE_OT_select_link_viewer", "Link Viewer", OPTYPE_UNDO); WM_operatortype_macro_define(ot, "NODE_OT_select"); WM_operatortype_macro_define(ot, "NODE_OT_link_viewer"); } diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index ccf1752896b..3d8b1676ea5 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -42,8 +42,6 @@ #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "ED_node.h" #include "ED_screen.h" #include "ED_types.h" @@ -141,9 +139,9 @@ static int node_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void NODE_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select"); + ot->name= "Select"; ot->idname= "NODE_OT_select"; - ot->description= _("Select node under cursor"); + ot->description= "Select node under cursor"; /* api callbacks */ ot->invoke= node_select_invoke; @@ -153,9 +151,9 @@ void NODE_OT_select(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int(ot->srna, "mouse_x", 0, INT_MIN, INT_MAX, _("Mouse X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "mouse_y", 0, INT_MIN, INT_MAX, _("Mouse Y"), "", INT_MIN, INT_MAX); - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), ""); + RNA_def_int(ot->srna, "mouse_x", 0, INT_MIN, INT_MAX, "Mouse X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "mouse_y", 0, INT_MIN, INT_MAX, "Mouse Y", "", INT_MIN, INT_MAX); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", ""); } /* ****** Border Select ****** */ @@ -216,9 +214,9 @@ static int node_border_select_invoke(bContext *C, wmOperator *op, wmEvent *event void NODE_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); + ot->name= "Border Select"; ot->idname= "NODE_OT_select_border"; - ot->description= _("Use box selection to select nodes"); + ot->description= "Use box selection to select nodes"; /* api callbacks */ ot->invoke= node_border_select_invoke; @@ -233,7 +231,7 @@ void NODE_OT_select_border(wmOperatorType *ot) /* rna */ WM_operator_properties_gesture_border(ot, FALSE); - RNA_def_boolean(ot->srna, "tweak", 0, _("Tweak"), _("Only activate when mouse is not over a node - useful for tweak gesture")); + RNA_def_boolean(ot->srna, "tweak", 0, "Tweak", "Only activate when mouse is not over a node - useful for tweak gesture"); } /* ****** Select/Deselect All ****** */ @@ -267,8 +265,8 @@ static int node_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select or Deselect All"); - ot->description = _("(De)select all nodes"); + ot->name = "Select or Deselect All"; + ot->description = "(De)select all nodes"; ot->idname = "NODE_OT_select_all"; /* api callbacks */ @@ -309,8 +307,8 @@ static int node_select_linked_to_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_linked_to(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Linked To"); - ot->description = _("Select nodes linked to the selected ones"); + ot->name = "Select Linked To"; + ot->description = "Select nodes linked to the selected ones"; ot->idname = "NODE_OT_select_linked_to"; /* api callbacks */ @@ -351,8 +349,8 @@ static int node_select_linked_from_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_linked_from(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Linked From"); - ot->description = _("Select nodes linked from the selected ones"); + ot->name = "Select Linked From"; + ot->description = "Select nodes linked from the selected ones"; ot->idname = "NODE_OT_select_linked_from"; /* api callbacks */ @@ -380,8 +378,8 @@ static int node_select_same_type_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_same_type(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Same Type"); - ot->description = _("Select all the same type"); + ot->name = "Select Same Type"; + ot->description = "Select all the same type"; ot->idname = "NODE_OT_select_same_type"; /* api callbacks */ @@ -410,8 +408,8 @@ static int node_select_same_type_next_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_same_type_next(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Same Type Next"); - ot->description = _("Select the next node of the same type."); + ot->name = "Select Same Type Next"; + ot->description = "Select the next node of the same type."; ot->idname = "NODE_OT_select_same_type_next"; /* api callbacks */ @@ -437,8 +435,8 @@ static int node_select_same_type_prev_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_same_type_prev(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Select Same Type Prev"); - ot->description = _("Select the prev node of the same type."); + ot->name = "Select Same Type Prev"; + ot->description = "Select the prev node of the same type."; ot->idname = "NODE_OT_select_same_type_prev"; /* api callbacks */ diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index 1c64d09265d..c4567bea648 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -39,8 +39,6 @@ #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_node.h" @@ -196,9 +194,9 @@ static int node_toggle_visibility_invoke(bContext *C, wmOperator *op, wmEvent *e void NODE_OT_visibility_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Visibility"); + ot->name= "Toggle Visibility"; ot->idname= "NODE_OT_visibility_toggle"; - ot->description= _("Handle clicks on node header buttons"); + ot->description= "Handle clicks on node header buttons"; /* api callbacks */ ot->invoke= node_toggle_visibility_invoke; @@ -207,8 +205,8 @@ void NODE_OT_visibility_toggle(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "mouse_x", 0, INT_MIN, INT_MAX, _("Mouse X"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "mouse_y", 0, INT_MIN, INT_MAX, _("Mouse Y"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "mouse_x", 0, INT_MIN, INT_MAX, "Mouse X", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "mouse_y", 0, INT_MIN, INT_MAX, "Mouse Y", "", INT_MIN, INT_MAX); } /* **************** View All Operator ************** */ @@ -279,9 +277,9 @@ static int node_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "NODE_OT_view_all"; - ot->description= _("Resize view so you can see all nodes"); + ot->description= "Resize view so you can see all nodes"; /* api callbacks */ ot->exec= node_view_all_exec; diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 3375cb4b420..d969a80a678 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/space_outliner/SConscript b/source/blender/editors/space_outliner/SConscript index 5e57d9bab85..f451050588b 100644 --- a/source/blender/editors/space_outliner/SConscript +++ b/source/blender/editors/space_outliner/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc ../../makesrna ../../blenloader' incs += ' #/extern/glew/include' diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index c08beed3051..9d3bd4a67aa 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript index b718ff59576..c30e204f6f4 100644 --- a/source/blender/editors/space_script/SConscript +++ b/source/blender/editors/space_script/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna ../../blenloader' incs += ' ../../python' diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index e4cddada224..02cbc81aaa5 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -37,8 +37,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "WM_api.h" @@ -75,8 +73,8 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) void SCRIPT_OT_python_file_run(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Run python file"); - ot->description= _("Run Python file"); + ot->name= "Run python file"; + ot->description= "Run Python file"; ot->idname= "SCRIPT_OT_python_file_run"; ot->flag = OPTYPE_UNDO; @@ -84,7 +82,7 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot) ot->exec= run_pyfile_exec; ot->poll= ED_operator_areaactive; - RNA_def_string_file_path(ot->srna, "filepath", "", 512, _("Path"), ""); + RNA_def_string_file_path(ot->srna, "filepath", "", 512, "Path", ""); } @@ -107,8 +105,8 @@ static int script_reload_exec(bContext *C, wmOperator *UNUSED(op)) void SCRIPT_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reload Scripts"); - ot->description= _("Reload Scripts"); + ot->name= "Reload Scripts"; + ot->description= "Reload Scripts"; ot->idname= "SCRIPT_OT_reload"; /* api callbacks */ diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 9b978dffc39..9ce5f8e5279 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 67a6852fedf..3430c10b766 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna ../../blenloader' incs += ' #/intern/audaspace/intern' diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 2a3de6adec4..2fe16b3a85d 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -47,8 +47,6 @@ #include "BLI_storage_types.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "DNA_userdef_types.h" @@ -93,16 +91,16 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) { if(flag & SEQPROP_STARTFRAME) - RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, _("Start Frame"), _("Start frame of the sequence strip"), INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX); if(flag & SEQPROP_ENDFRAME) - RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, _("End Frame"), _("End frame for the color strip"), INT_MIN, INT_MAX); /* not useual since most strips have a fixed length */ + RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not useual since most strips have a fixed length */ - RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, _("Channel"), _("Channel to place this strip into"), 1, MAXSEQ); + RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, "Channel", "Channel to place this strip into", 1, MAXSEQ); - RNA_def_boolean(ot->srna, "replace_sel", 1, _("Replace Selection"), _("replace the current selection")); + RNA_def_boolean(ot->srna, "replace_sel", 1, "Replace Selection", "replace the current selection"); - RNA_def_boolean(ot->srna, "overlap", 0, _("Allow Overlap"), _("Don't correct overlap on new sequence strips")); + RNA_def_boolean(ot->srna, "overlap", 0, "Allow Overlap", "Don't correct overlap on new sequence strips"); } static void sequencer_generic_invoke_path__internal(bContext *C, wmOperator *op, const char *identifier) @@ -283,9 +281,9 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= _("Add Scene Strip"); + ot->name= "Add Scene Strip"; ot->idname= "SEQUENCER_OT_scene_strip_add"; - ot->description= _("Add a strip to the sequencer using a blender scene as a source"); + ot->description= "Add a strip to the sequencer using a blender scene as a source"; /* api callbacks */ ot->invoke= sequencer_add_scene_strip_invoke; @@ -297,7 +295,7 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); - prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, _("Scene"), ""); + prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); ot->prop= prop; } @@ -396,9 +394,9 @@ void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Movie Strip"); + ot->name= "Add Movie Strip"; ot->idname= "SEQUENCER_OT_movie_strip_add"; - ot->description= _("Add a movie strip to the sequencer"); + ot->description= "Add a movie strip to the sequencer"; /* api callbacks */ ot->invoke= sequencer_add_movie_strip_invoke; @@ -411,7 +409,7 @@ void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot) WM_operator_properties_filesel(ot, FOLDERFILE|MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH|WM_FILESEL_FILES); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); - RNA_def_boolean(ot->srna, "sound", TRUE, _("Sound"), _("Load sound with the movie")); + RNA_def_boolean(ot->srna, "sound", TRUE, "Sound", "Load sound with the movie"); } /* add sound operator */ @@ -451,9 +449,9 @@ void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Sound Strip"); + ot->name= "Add Sound Strip"; ot->idname= "SEQUENCER_OT_sound_strip_add"; - ot->description= _("Add a sound strip to the sequencer"); + ot->description= "Add a sound strip to the sequencer"; /* api callbacks */ ot->invoke= sequencer_add_sound_strip_invoke; @@ -466,7 +464,7 @@ void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot) WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH|WM_FILESEL_FILES); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); - RNA_def_boolean(ot->srna, "cache", FALSE, _("Cache"), _("Cache the sound in memory.")); + RNA_def_boolean(ot->srna, "cache", FALSE, "Cache", "Cache the sound in memory."); } /* add image operator */ @@ -558,9 +556,9 @@ void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Image Strip"); + ot->name= "Add Image Strip"; ot->idname= "SEQUENCER_OT_image_strip_add"; - ot->description= _("Add an image or image sequence to the sequencer"); + ot->description= "Add an image or image sequence to the sequencer"; /* api callbacks */ ot->invoke= sequencer_add_image_strip_invoke; @@ -738,9 +736,9 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Add Effect Strip"); + ot->name= "Add Effect Strip"; ot->idname= "SEQUENCER_OT_effect_strip_add"; - ot->description= _("Add an effect to the sequencer, most are applied on top of existing strips"); + ot->description= "Add an effect to the sequencer, most are applied on top of existing strips"; /* api callbacks */ ot->invoke= sequencer_add_effect_strip_invoke; @@ -753,6 +751,6 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot) WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH); sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME|SEQPROP_ENDFRAME); - RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, _("Type"), _("Sequencer effect type")); - RNA_def_float_vector(ot->srna, "color", 3, NULL, 0.0f, 1.0f, _("Color"), _("Initialize the strip with this color (only used when type='COLOR')"), 0.0f, 1.0f); + RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, "Type", "Sequencer effect type"); + RNA_def_float_vector(ot->srna, "color", 3, NULL, 0.0f, 1.0f, "Color", "Initialize the strip with this color (only used when type='COLOR')", 0.0f, 1.0f); } diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index a2f4e66fe67..01a43fd7fe1 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -38,8 +38,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_screen.h" @@ -111,9 +109,9 @@ static int sequencer_properties(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); + ot->name= "Properties"; ot->idname= "SEQUENCER_OT_properties"; - ot->description= _("Open sequencer properties panel"); + ot->description= "Open sequencer properties panel"; ot->exec= sequencer_properties; ot->poll= ED_operator_sequencer_active; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index ac38445267e..e7673651546 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -49,8 +49,6 @@ #include "BLI_utildefines.h" #include "BLI_threads.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "DNA_userdef_types.h" @@ -84,37 +82,37 @@ static int okee(const char *UNUSED(dummy)) {return 0;} /* XXX */ /* RNA Enums, used in multiple files */ EnumPropertyItem sequencer_prop_effect_types[] = { - {SEQ_CROSS, "CROSS", 0, N_("Crossfade"), N_("Crossfade effect strip type")}, - {SEQ_ADD, "ADD", 0, N_("Add"), N_("Add effect strip type")}, - {SEQ_SUB, "SUBTRACT", 0, N_("Subtract"), N_("Subtract effect strip type")}, - {SEQ_ALPHAOVER, "ALPHA_OVER", 0, N_("Alpha Over"), N_("Alpha Over effect strip type")}, - {SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, N_("Alpha Under"), N_("Alpha Under effect strip type")}, - {SEQ_GAMCROSS, "GAMMA_CROSS", 0, N_("Gamma Cross"), N_("Gamma Cross effect strip type")}, - {SEQ_MUL, "MULTIPLY", 0, N_("Multiply"), N_("Multiply effect strip type")}, - {SEQ_OVERDROP, "OVER_DROP", 0, N_("Alpha Over Drop"), N_("Alpha Over Drop effect strip type")}, - {SEQ_PLUGIN, "PLUGIN", 0, N_("Plugin"), N_("Plugin effect strip type")}, - {SEQ_WIPE, "WIPE", 0, N_("Wipe"), N_("Wipe effect strip type")}, - {SEQ_GLOW, "GLOW", 0, N_("Glow"), N_("Glow effect strip type")}, - {SEQ_TRANSFORM, "TRANSFORM", 0, N_("Transform"), N_("Transform effect strip type")}, - {SEQ_COLOR, "COLOR", 0, N_("Color"), N_("Color effect strip type")}, - {SEQ_SPEED, "SPEED", 0, N_("Speed"), N_("Color effect strip type")}, - {SEQ_MULTICAM, "MULTICAM", 0, N_("Multicam Selector"), ""}, - {SEQ_ADJUSTMENT, "ADJUSTMENT", 0, N_("Adjustment Layer"), ""}, + {SEQ_CROSS, "CROSS", 0, "Crossfade", "Crossfade effect strip type"}, + {SEQ_ADD, "ADD", 0, "Add", "Add effect strip type"}, + {SEQ_SUB, "SUBTRACT", 0, "Subtract", "Subtract effect strip type"}, + {SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", "Alpha Over effect strip type"}, + {SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", "Alpha Under effect strip type"}, + {SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"}, + {SEQ_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"}, + {SEQ_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"}, + {SEQ_PLUGIN, "PLUGIN", 0, "Plugin", "Plugin effect strip type"}, + {SEQ_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"}, + {SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"}, + {SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"}, + {SEQ_COLOR, "COLOR", 0, "Color", "Color effect strip type"}, + {SEQ_SPEED, "SPEED", 0, "Speed", "Color effect strip type"}, + {SEQ_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""}, + {SEQ_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""}, {0, NULL, 0, NULL, NULL} }; /* mute operator */ EnumPropertyItem prop_side_types[] = { - {SEQ_SIDE_LEFT, "LEFT", 0, N_("Left"), ""}, - {SEQ_SIDE_RIGHT, "RIGHT", 0, N_("Right"), ""}, - {SEQ_SIDE_BOTH, "BOTH", 0, N_("Both"), ""}, + {SEQ_SIDE_LEFT, "LEFT", 0, "Left", ""}, + {SEQ_SIDE_RIGHT, "RIGHT", 0, "Right", ""}, + {SEQ_SIDE_BOTH, "BOTH", 0, "Both", ""}, {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem prop_side_lr_types[] = { - {SEQ_SIDE_LEFT, "LEFT", 0, N_("Left"), ""}, - {SEQ_SIDE_RIGHT, "RIGHT", 0, N_("Right"), ""}, + {SEQ_SIDE_LEFT, "LEFT", 0, "Left", ""}, + {SEQ_SIDE_RIGHT, "RIGHT", 0, "Right", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1105,9 +1103,9 @@ static int sequencer_snap_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev void SEQUENCER_OT_snap(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Snap strips"); + ot->name= "Snap strips"; ot->idname= "SEQUENCER_OT_snap"; - ot->description=_("Frame where selected strips will be snapped"); + ot->description="Frame where selected strips will be snapped"; /* api callbacks */ ot->invoke= sequencer_snap_invoke; @@ -1117,7 +1115,7 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, _("Frame"), _("Frame where selected strips will be snapped"), INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will be snapped", INT_MIN, INT_MAX); } /* mute operator */ @@ -1152,9 +1150,9 @@ static int sequencer_mute_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_mute(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mute Strips"); + ot->name= "Mute Strips"; ot->idname= "SEQUENCER_OT_mute"; - ot->description=_("Mute selected strips"); + ot->description="Mute selected strips"; /* api callbacks */ ot->exec= sequencer_mute_exec; @@ -1163,7 +1161,7 @@ void SEQUENCER_OT_mute(struct wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Mute unselected rather than selected strips.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Mute unselected rather than selected strips."); } @@ -1199,9 +1197,9 @@ static int sequencer_unmute_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_unmute(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Un-Mute Strips"); + ot->name= "Un-Mute Strips"; ot->idname= "SEQUENCER_OT_unmute"; - ot->description=_("Un-Mute unselected rather than selected strips"); + ot->description="Un-Mute unselected rather than selected strips"; /* api callbacks */ ot->exec= sequencer_unmute_exec; @@ -1210,7 +1208,7 @@ void SEQUENCER_OT_unmute(struct wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("UnMute unselected rather than selected strips.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "UnMute unselected rather than selected strips."); } @@ -1235,9 +1233,9 @@ static int sequencer_lock_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_lock(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Lock Strips"); + ot->name= "Lock Strips"; ot->idname= "SEQUENCER_OT_lock"; - ot->description=_("Lock the active strip so that it can't be transformed"); + ot->description="Lock the active strip so that it can't be transformed"; /* api callbacks */ ot->exec= sequencer_lock_exec; @@ -1268,9 +1266,9 @@ static int sequencer_unlock_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_unlock(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("UnLock Strips"); + ot->name= "UnLock Strips"; ot->idname= "SEQUENCER_OT_unlock"; - ot->description=_("Unlock the active strip so that it can't be transformed"); + ot->description="Unlock the active strip so that it can't be transformed"; /* api callbacks */ ot->exec= sequencer_unlock_exec; @@ -1301,9 +1299,9 @@ static int sequencer_reload_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_reload(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reload Strips"); + ot->name= "Reload Strips"; ot->idname= "SEQUENCER_OT_reload"; - ot->description=_("Reload strips in the sequencer"); + ot->description="Reload strips in the sequencer"; /* api callbacks */ ot->exec= sequencer_reload_exec; @@ -1329,9 +1327,9 @@ static int sequencer_refresh_all_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Refresh Sequencer"); + ot->name= "Refresh Sequencer"; ot->idname= "SEQUENCER_OT_refresh_all"; - ot->description=_("Refresh the sequencer editor"); + ot->description="Refresh the sequencer editor"; /* api callbacks */ ot->exec= sequencer_refresh_all_exec; @@ -1386,9 +1384,9 @@ static int sequencer_effect_poll(bContext *C) void SEQUENCER_OT_reassign_inputs(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reassign Inputs"); + ot->name= "Reassign Inputs"; ot->idname= "SEQUENCER_OT_reassign_inputs"; - ot->description=_("Reassign the inputs for the effects strip"); + ot->description="Reassign the inputs for the effects strip"; /* api callbacks */ ot->exec= sequencer_reassign_inputs_exec; @@ -1422,9 +1420,9 @@ static int sequencer_swap_inputs_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap_inputs(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Swap Inputs"); + ot->name= "Swap Inputs"; ot->idname= "SEQUENCER_OT_swap_inputs"; - ot->description=_("Swap the first two inputs for the effects strip"); + ot->description="Swap the first two inputs for the effects strip"; /* api callbacks */ ot->exec= sequencer_swap_inputs_exec; @@ -1437,8 +1435,8 @@ void SEQUENCER_OT_swap_inputs(struct wmOperatorType *ot) /* cut operator */ static EnumPropertyItem prop_cut_types[] = { - {SEQ_CUT_SOFT, "SOFT", 0, N_("Soft"), ""}, - {SEQ_CUT_HARD, "HARD", 0, N_("Hard"), ""}, + {SEQ_CUT_SOFT, "SOFT", 0, "Soft", ""}, + {SEQ_CUT_HARD, "HARD", 0, "Hard", ""}, {0, NULL, 0, NULL, NULL} }; @@ -1513,9 +1511,9 @@ static int sequencer_cut_invoke(bContext *C, wmOperator *op, wmEvent *event) void SEQUENCER_OT_cut(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cut Strips"); + ot->name= "Cut Strips"; ot->idname= "SEQUENCER_OT_cut"; - ot->description=_("Cut the selected strips"); + ot->description="Cut the selected strips"; /* api callbacks */ ot->invoke= sequencer_cut_invoke; @@ -1525,9 +1523,9 @@ void SEQUENCER_OT_cut(struct wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, _("Frame"), _("Frame where selected strips will be cut"), INT_MIN, INT_MAX); - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_cut_types), SEQ_CUT_SOFT, _("Type"), _("The type of cut operation to perform on strips")); - RNA_def_enum(ot->srna, "side", RNA_enum_items_gettexted(prop_side_types), SEQ_SIDE_BOTH, _("Side"), _("The side that remains selected after cutting")); + RNA_def_int(ot->srna, "frame", 0, INT_MIN, INT_MAX, "Frame", "Frame where selected strips will be cut", INT_MIN, INT_MAX); + RNA_def_enum(ot->srna, "type", prop_cut_types, SEQ_CUT_SOFT, "Type", "The type of cut operation to perform on strips"); + RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side that remains selected after cutting"); } /* duplicate operator */ @@ -1583,9 +1581,9 @@ static int sequencer_add_duplicate_invoke(bContext *C, wmOperator *op, wmEvent * void SEQUENCER_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Duplicate Strips"); + ot->name= "Duplicate Strips"; ot->idname= "SEQUENCER_OT_duplicate"; - ot->description=_("Duplicate the selected strips"); + ot->description="Duplicate the selected strips"; /* api callbacks */ ot->invoke= sequencer_add_duplicate_invoke; @@ -1596,7 +1594,7 @@ void SEQUENCER_OT_duplicate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); } /* delete operator */ @@ -1656,9 +1654,9 @@ void SEQUENCER_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Erase Strips"); + ot->name= "Erase Strips"; ot->idname= "SEQUENCER_OT_delete"; - ot->description=_("Erase selected strips from the sequencer"); + ot->description="Erase selected strips from the sequencer"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -1801,9 +1799,9 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_images_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Separate Images"); + ot->name= "Separate Images"; ot->idname= "SEQUENCER_OT_images_separate"; - ot->description=_("On image sequences strips, it return a strip for each image"); + ot->description="On image sequences strips, it return a strip for each image"; /* api callbacks */ ot->exec= sequencer_separate_images_exec; @@ -1812,7 +1810,7 @@ void SEQUENCER_OT_images_separate(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "length", 1, 1, 1000, _("Length"), _("Length of each frame"), 1, INT_MAX); + RNA_def_int(ot->srna, "length", 1, 1, 1000, "Length", "Length of each frame", 1, INT_MAX); } @@ -1873,9 +1871,9 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_meta_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Meta Strip"); + ot->name= "Toggle Meta Strip"; ot->idname= "SEQUENCER_OT_meta_toggle"; - ot->description=_("Toggle a metastrip (to edit enclosed strips)"); + ot->description="Toggle a metastrip (to edit enclosed strips)"; /* api callbacks */ ot->exec= sequencer_meta_toggle_exec; @@ -1940,9 +1938,9 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_meta_make(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Meta Strip"); + ot->name= "Make Meta Strip"; ot->idname= "SEQUENCER_OT_meta_make"; - ot->description=_("Group selected strips into a metastrip"); + ot->description="Group selected strips into a metastrip"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -2011,9 +2009,9 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_meta_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("UnMeta Strip"); + ot->name= "UnMeta Strip"; ot->idname= "SEQUENCER_OT_meta_separate"; - ot->description=_("Put the contents of a metastrip back in the sequencer"); + ot->description="Put the contents of a metastrip back in the sequencer"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -2044,9 +2042,9 @@ static int sequencer_view_all_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "SEQUENCER_OT_view_all"; - ot->description=_("View all the strips in the sequencer"); + ot->description="View all the strips in the sequencer"; /* api callbacks */ ot->exec= sequencer_view_all_exec; @@ -2110,9 +2108,9 @@ static int sequencer_view_all_preview_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_all_preview(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "SEQUENCER_OT_view_all_preview"; - ot->description=_("Zoom preview to fit in the area"); + ot->description="Zoom preview to fit in the area"; /* api callbacks */ ot->exec= sequencer_view_all_preview_exec; @@ -2146,9 +2144,9 @@ static int sequencer_view_zoom_ratio_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sequencer View Zoom Ratio"); + ot->name= "Sequencer View Zoom Ratio"; ot->idname= "SEQUENCER_OT_view_zoom_ratio"; - ot->description = _("Change zoom ratio of sequencer preview"); + ot->description = "Change zoom ratio of sequencer preview"; /* api callbacks */ ot->exec= sequencer_view_zoom_ratio_exec; @@ -2156,15 +2154,15 @@ void SEQUENCER_OT_view_zoom_ratio(wmOperatorType *ot) /* properties */ RNA_def_float(ot->srna, "ratio", 1.0f, 0.0f, FLT_MAX, - _("Ratio"), _("Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out."), -FLT_MAX, FLT_MAX); + "Ratio", "Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out.", -FLT_MAX, FLT_MAX); } #if 0 static EnumPropertyItem view_type_items[] = { - {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, N_("Sequencer"), ""}, - {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, N_("Image Preview"), ""}, - {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SEQUENCER, N_("Sequencer and Image Preview"), ""}, + {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, "Sequencer", ""}, + {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, "Image Preview", ""}, + {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SEQUENCER, "Sequencer and Image Preview", ""}, {0, NULL, 0, NULL, NULL}}; #endif @@ -2184,9 +2182,9 @@ static int sequencer_view_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Toggle"); + ot->name= "View Toggle"; ot->idname= "SEQUENCER_OT_view_toggle"; - ot->description=_("Toggle between sequencer views (sequence, preview, both)"); + ot->description="Toggle between sequencer views (sequence, preview, both)"; /* api callbacks */ ot->exec= sequencer_view_toggle_exec; @@ -2264,9 +2262,9 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Selected"); + ot->name= "View Selected"; ot->idname= "SEQUENCER_OT_view_selected"; - ot->description=_("Zoom the sequencer on the selected strips"); + ot->description="Zoom the sequencer on the selected strips"; /* api callbacks */ ot->exec= sequencer_view_selected_exec; @@ -2349,9 +2347,9 @@ static int sequencer_next_edit_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_next_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Next Edit"); + ot->name= "Next Edit"; ot->idname= "SEQUENCER_OT_next_edit"; - ot->description=_("Move frame to next edit point"); + ot->description="Move frame to next edit point"; /* api callbacks */ ot->exec= sequencer_next_edit_exec; @@ -2379,9 +2377,9 @@ static int sequencer_previous_edit_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_previous_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Previous Edit"); + ot->name= "Previous Edit"; ot->idname= "SEQUENCER_OT_previous_edit"; - ot->description=_("Move frame to previous edit point"); + ot->description="Move frame to previous edit point"; /* api callbacks */ ot->exec= sequencer_previous_edit_exec; @@ -2483,9 +2481,9 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Swap Strip"); + ot->name= "Swap Strip"; ot->idname= "SEQUENCER_OT_swap"; - ot->description=_("Swap active strip with strip to the left"); + ot->description="Swap active strip with strip to the left"; /* api callbacks */ ot->exec= sequencer_swap_exec; @@ -2495,7 +2493,7 @@ void SEQUENCER_OT_swap(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "side", RNA_enum_items_gettexted(prop_side_lr_types), SEQ_SIDE_RIGHT, _("Side"), _("Side of the strip to swap")); + RNA_def_enum(ot->srna, "side", prop_side_lr_types, SEQ_SIDE_RIGHT, "Side", "Side of the strip to swap"); } static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2542,9 +2540,9 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_rendersize(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Render Size"); + ot->name= "Set Render Size"; ot->idname= "SEQUENCER_OT_rendersize"; - ot->description=_("Set render size and aspect from active sequence"); + ot->description="Set render size and aspect from active sequence"; /* api callbacks */ ot->exec= sequencer_rendersize_exec; @@ -2621,7 +2619,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy"); + ot->name= "Copy"; ot->idname= "SEQUENCER_OT_copy"; ot->description=""; @@ -2672,7 +2670,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste"); + ot->name= "Paste"; ot->idname= "SEQUENCER_OT_paste"; ot->description=""; @@ -2723,9 +2721,9 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_swap_data(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sequencer Swap Data"); + ot->name= "Sequencer Swap Data"; ot->idname= "SEQUENCER_OT_swap_data"; - ot->description=_("Swap 2 sequencer strips"); + ot->description="Swap 2 sequencer strips"; /* api callbacks */ ot->exec= sequencer_swap_data_exec; @@ -2780,9 +2778,9 @@ static int view_ghost_border_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Offset View"); + ot->name= "Border Offset View"; ot->idname= "SEQUENCER_OT_view_ghost_border"; - ot->description=_("Enable border select mode"); + ot->description="Enable border select mode"; /* api callbacks */ ot->invoke= WM_border_select_invoke; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 88e64b184e1..86b28f5e89e 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -44,8 +44,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "DNA_scene_types.h" #include "BKE_context.h" @@ -248,9 +246,9 @@ static int sequencer_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_all_toggle(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); + ot->name= "Select or Deselect All"; ot->idname= "SEQUENCER_OT_select_all_toggle"; - ot->description=_("Select or deselect all strips"); + ot->description="Select or deselect all strips"; /* api callbacks */ ot->exec= sequencer_deselect_exec; @@ -286,9 +284,9 @@ static int sequencer_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_inverse(struct wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Inverse"); + ot->name= "Select Inverse"; ot->idname= "SEQUENCER_OT_select_inverse"; - ot->description=_("Select unselected strips"); + ot->description="Select unselected strips"; /* api callbacks */ ot->exec= sequencer_select_inverse_exec; @@ -509,9 +507,9 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void SEQUENCER_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Activate/Select"); + ot->name= "Activate/Select"; ot->idname= "SEQUENCER_OT_select"; - ot->description=_("Select a strip (last selected becomes the \"active strip\")"); + ot->description="Select a strip (last selected becomes the \"active strip\")"; /* api callbacks */ ot->invoke= sequencer_select_invoke; @@ -521,11 +519,11 @@ void SEQUENCER_OT_select(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend the selection.")); - RNA_def_boolean(ot->srna, "linked_handle", 0, _("Linked Handle"), _("Select handles next to the active strip.")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection."); + RNA_def_boolean(ot->srna, "linked_handle", 0, "Linked Handle", "Select handles next to the active strip."); /* for animation this is an enum but atm having an enum isnt useful for us */ - RNA_def_boolean(ot->srna, "left_right", 0, _("Left/Right"), _("select based on the frame side the cursor is on.")); - RNA_def_boolean(ot->srna, "linked_time", 0, _("Linked Time"), _("Select other strips at the same time.")); + RNA_def_boolean(ot->srna, "left_right", 0, "Left/Right", "select based on the frame side the cursor is on."); + RNA_def_boolean(ot->srna, "linked_time", 0, "Linked Time", "Select other strips at the same time."); } @@ -598,9 +596,9 @@ static int sequencer_select_more_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select More"); + ot->name= "Select More"; ot->idname= "SEQUENCER_OT_select_more"; - ot->description=_("Select more strips adjacent to the current selection"); + ot->description="Select more strips adjacent to the current selection"; /* api callbacks */ ot->exec= sequencer_select_more_exec; @@ -629,9 +627,9 @@ static int sequencer_select_less_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select less"); + ot->name= "Select less"; ot->idname= "SEQUENCER_OT_select_less"; - ot->description=_("Shrink the current selection of adjacent selected strips"); + ot->description="Shrink the current selection of adjacent selected strips"; /* api callbacks */ ot->exec= sequencer_select_less_exec; @@ -679,9 +677,9 @@ static int sequencer_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEv void SEQUENCER_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select pick linked"); + ot->name= "Select pick linked"; ot->idname= "SEQUENCER_OT_select_linked_pick"; - ot->description=_("Select a chain of linked strips nearest to the mouse pointer"); + ot->description="Select a chain of linked strips nearest to the mouse pointer"; /* api callbacks */ ot->invoke= sequencer_select_linked_pick_invoke; @@ -691,7 +689,7 @@ void SEQUENCER_OT_select_linked_pick(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("extend the selection")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "extend the selection"); } @@ -714,9 +712,9 @@ static int sequencer_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) void SEQUENCER_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select linked"); + ot->name= "Select linked"; ot->idname= "SEQUENCER_OT_select_linked"; - ot->description=_("Select all strips adjacent to the current selection"); + ot->description="Select all strips adjacent to the current selection"; /* api callbacks */ ot->exec= sequencer_select_linked_exec; @@ -764,9 +762,9 @@ static int sequencer_select_handles_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_handles(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Handles"); + ot->name= "Select Handles"; ot->idname= "SEQUENCER_OT_select_handles"; - ot->description=_("Select manipulator handles on the sides of the selected strip"); + ot->description="Select manipulator handles on the sides of the selected strip"; /* api callbacks */ ot->exec= sequencer_select_handles_exec; @@ -776,7 +774,7 @@ void SEQUENCER_OT_select_handles(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, _("Side"), _("The side of the handle that is selected")); + RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side of the handle that is selected"); } /* select side operator */ @@ -801,9 +799,9 @@ static int sequencer_select_active_side_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_active_side(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Active Side"); + ot->name= "Select Active Side"; ot->idname= "SEQUENCER_OT_select_active_side"; - ot->description=_("Select strips on the nominated side of the active strip"); + ot->description="Select strips on the nominated side of the active strip"; /* api callbacks */ ot->exec= sequencer_select_active_side_exec; @@ -813,7 +811,7 @@ void SEQUENCER_OT_select_active_side(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, _("Side"), _("The side of the handle that is selected")); + RNA_def_enum(ot->srna, "side", prop_side_types, SEQ_SIDE_BOTH, "Side", "The side of the handle that is selected"); } @@ -865,9 +863,9 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); + ot->name= "Border Select"; ot->idname= "SEQUENCER_OT_select_border"; - ot->description=_("Enable border select mode"); + ot->description="Enable border select mode"; /* api callbacks */ ot->invoke= WM_border_select_invoke; diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index e82448e1277..165cec238c0 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -54,8 +54,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_screen.h" @@ -121,8 +119,8 @@ static int properties_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_properties(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Properties"); - ot->description= _("Toggle text properties panel"); + ot->name= "Properties"; + ot->description= "Toggle text properties panel"; ot->idname= "TEXT_OT_properties"; /* api callbacks */ diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index fcf7345e3c5..617bbf62e92 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -46,8 +46,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "PIL_time.h" #include "BKE_context.h" @@ -194,9 +192,9 @@ static int new_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Create Text Block"); + ot->name= "Create Text Block"; ot->idname= "TEXT_OT_new"; - ot->description= _("Create a new text data block"); + ot->description= "Create a new text data block"; /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -294,9 +292,9 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Open Text Block"); + ot->name= "Open Text Block"; ot->idname= "TEXT_OT_open"; - ot->description= _("Open a new text data block"); + ot->description= "Open a new text data block"; /* api callbacks */ ot->exec= open_exec; @@ -309,7 +307,7 @@ void TEXT_OT_open(wmOperatorType *ot) /* properties */ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE|PYSCRIPTFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH); //XXX TODO, relative_path - RNA_def_boolean(ot->srna, "internal", 0, _("Make internal"), _("Make text file internal after loading")); + RNA_def_boolean(ot->srna, "internal", 0, "Make internal", "Make text file internal after loading"); } /******************* reload operator *********************/ @@ -339,9 +337,9 @@ static int reload_exec(bContext *C, wmOperator *op) void TEXT_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reload"); + ot->name= "Reload"; ot->idname= "TEXT_OT_reload"; - ot->description= _("Reload active text data block from its file"); + ot->description= "Reload active text data block from its file"; /* api callbacks */ ot->exec= reload_exec; @@ -389,9 +387,9 @@ static int unlink_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_unlink(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Unlink"); + ot->name= "Unlink"; ot->idname= "TEXT_OT_unlink"; - ot->description= _("Unlink active text data block"); + ot->description= "Unlink active text data block"; /* api callbacks */ ot->exec= unlink_exec; @@ -424,9 +422,9 @@ static int make_internal_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_make_internal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Make Internal"); + ot->name= "Make Internal"; ot->idname= "TEXT_OT_make_internal"; - ot->description= _("Make active text file internal"); + ot->description= "Make active text file internal"; /* api callbacks */ ot->exec= make_internal_exec; @@ -501,9 +499,9 @@ static int save_exec(bContext *C, wmOperator *op) void TEXT_OT_save(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Save"); + ot->name= "Save"; ot->idname= "TEXT_OT_save"; - ot->description= _("Save active text data block"); + ot->description= "Save active text data block"; /* api callbacks */ ot->exec= save_exec; @@ -558,9 +556,9 @@ static int save_as_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_save_as(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Save As"); + ot->name= "Save As"; ot->idname= "TEXT_OT_save_as"; - ot->description= _("Save active text file with options"); + ot->description= "Save active text file with options"; /* api callbacks */ ot->exec= save_as_exec; @@ -628,9 +626,9 @@ static int run_script_exec(bContext *C, wmOperator *op) void TEXT_OT_run_script(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Run Script"); + ot->name= "Run Script"; ot->idname= "TEXT_OT_run_script"; - ot->description= _("Run active script"); + ot->description= "Run active script"; /* api callbacks */ ot->poll= run_script_poll; @@ -688,9 +686,9 @@ static int refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUSED(op void TEXT_OT_refresh_pyconstraints(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Refresh PyConstraints"); + ot->name= "Refresh PyConstraints"; ot->idname= "TEXT_OT_refresh_pyconstraints"; - ot->description= _("Refresh all pyconstraints"); + ot->description= "Refresh all pyconstraints"; /* api callbacks */ ot->exec= refresh_pyconstraints_exec; @@ -812,16 +810,16 @@ static int paste_exec(bContext *C, wmOperator *op) void TEXT_OT_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Paste"); + ot->name= "Paste"; ot->idname= "TEXT_OT_paste"; - ot->description= _("Paste text from clipboard"); + ot->description= "Paste text from clipboard"; /* api callbacks */ ot->exec= paste_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_boolean(ot->srna, "selection", 0, _("Selection"), _("Paste text selected elsewhere rather than copied, X11 only.")); + RNA_def_boolean(ot->srna, "selection", 0, "Selection", "Paste text selected elsewhere rather than copied, X11 only."); } /******************* copy operator *********************/ @@ -850,9 +848,9 @@ static int copy_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Copy"); + ot->name= "Copy"; ot->idname= "TEXT_OT_copy"; - ot->description= _("Copy selected text to clipboard"); + ot->description= "Copy selected text to clipboard"; /* api callbacks */ ot->exec= copy_exec; @@ -883,9 +881,9 @@ static int cut_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_cut(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cut"); + ot->name= "Cut"; ot->idname= "TEXT_OT_cut"; - ot->description= _("Cut selected text to clipboard"); + ot->description= "Cut selected text to clipboard"; /* api callbacks */ ot->exec= cut_exec; @@ -918,9 +916,9 @@ static int indent_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_indent(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Indent"); + ot->name= "Indent"; ot->idname= "TEXT_OT_indent"; - ot->description= _("Indent selected text"); + ot->description= "Indent selected text"; /* api callbacks */ ot->exec= indent_exec; @@ -953,9 +951,9 @@ static int unindent_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_unindent(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Unindent"); + ot->name= "Unindent"; ot->idname= "TEXT_OT_unindent"; - ot->description= _("Unindent selected text"); + ot->description= "Unindent selected text"; /* api callbacks */ ot->exec= unindent_exec; @@ -1000,9 +998,9 @@ static int line_break_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_line_break(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Line Break"); + ot->name= "Line Break"; ot->idname= "TEXT_OT_line_break"; - ot->description= _("Insert line break at cursor position"); + ot->description= "Insert line break at cursor position"; /* api callbacks */ ot->exec= line_break_exec; @@ -1033,9 +1031,9 @@ static int comment_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_comment(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Comment"); + ot->name= "Comment"; ot->idname= "TEXT_OT_comment"; - ot->description= _("Convert selected text to comment"); + ot->description= "Convert selected text to comment"; /* api callbacks */ ot->exec= comment_exec; @@ -1067,9 +1065,9 @@ static int uncomment_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_uncomment(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Uncomment"); + ot->name= "Uncomment"; ot->idname= "TEXT_OT_uncomment"; - ot->description= _("Convert selected comment to text"); + ot->description= "Convert selected comment to text"; /* api callbacks */ ot->exec= uncomment_exec; @@ -1207,16 +1205,16 @@ static int convert_whitespace_exec(bContext *C, wmOperator *op) void TEXT_OT_convert_whitespace(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Convert Whitespace"); + ot->name= "Convert Whitespace"; ot->idname= "TEXT_OT_convert_whitespace"; - ot->description= _("Convert whitespaces by type"); + ot->description= "Convert whitespaces by type"; /* api callbacks */ ot->exec= convert_whitespace_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", whitespace_type_items, TO_SPACES, _("type"), _("Type of whitespace to convert to.")); + RNA_def_enum(ot->srna, "type", whitespace_type_items, TO_SPACES, "type", "Type of whitespace to convert to."); } /******************* select all operator *********************/ @@ -1236,9 +1234,9 @@ static int select_all_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select All"); + ot->name= "Select All"; ot->idname= "TEXT_OT_select_all"; - ot->description= _("Select all text"); + ot->description= "Select all text"; /* api callbacks */ ot->exec= select_all_exec; @@ -1262,9 +1260,9 @@ static int select_line_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_line(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Line"); + ot->name= "Select Line"; ot->idname= "TEXT_OT_select_line"; - ot->description= _("Select text by line"); + ot->description= "Select text by line"; /* api callbacks */ ot->exec= select_line_exec; @@ -1289,9 +1287,9 @@ static int select_word_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_select_word(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Word"); + ot->name= "Select Word"; ot->idname= "TEXT_OT_select_word"; - ot->description= _("Select word under cursor"); + ot->description= "Select word under cursor"; /* api callbacks */ ot->exec= select_word_exec; @@ -1325,9 +1323,9 @@ static int previous_marker_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_previous_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Previous Marker"); + ot->name= "Previous Marker"; ot->idname= "TEXT_OT_previous_marker"; - ot->description= _("Move to previous marker"); + ot->description= "Move to previous marker"; /* api callbacks */ ot->exec= previous_marker_exec; @@ -1361,9 +1359,9 @@ static int next_marker_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_next_marker(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Next Marker"); + ot->name= "Next Marker"; ot->idname= "TEXT_OT_next_marker"; - ot->description= _("Move to next marker"); + ot->description= "Move to next marker"; /* api callbacks */ ot->exec= next_marker_exec; @@ -1387,9 +1385,9 @@ static int clear_all_markers_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_markers_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clear All Markers"); + ot->name= "Clear All Markers"; ot->idname= "TEXT_OT_markers_clear"; - ot->description= _("Clear all markers"); + ot->description= "Clear all markers"; /* api callbacks */ ot->exec= clear_all_markers_exec; @@ -1900,16 +1898,16 @@ static int move_exec(bContext *C, wmOperator *op) void TEXT_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Cursor"); + ot->name= "Move Cursor"; ot->idname= "TEXT_OT_move"; - ot->description= _("Move cursor to position type"); + ot->description= "Move cursor to position type"; /* api callbacks */ ot->exec= move_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, _("Type"), _("Where to move cursor to.")); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to."); } /******************* move select operator ********************/ @@ -1924,16 +1922,16 @@ static int move_select_exec(bContext *C, wmOperator *op) void TEXT_OT_move_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move Select"); + ot->name= "Move Select"; ot->idname= "TEXT_OT_move_select"; - ot->description= _("Make selection from current cursor position to new cursor position type"); + ot->description= "Make selection from current cursor position to new cursor position type"; /* api callbacks */ ot->exec= move_select_exec; ot->poll= text_space_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, _("Type"), _("Where to move cursor to, to make a selection.")); + RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to, to make a selection."); } /******************* jump operator *********************/ @@ -1966,9 +1964,9 @@ static int jump_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void TEXT_OT_jump(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Jump"); + ot->name= "Jump"; ot->idname= "TEXT_OT_jump"; - ot->description= _("Jump cursor to line"); + ot->description= "Jump cursor to line"; /* api callbacks */ ot->invoke= jump_invoke; @@ -1976,7 +1974,7 @@ void TEXT_OT_jump(wmOperatorType *ot) ot->poll= text_edit_poll; /* properties */ - RNA_def_int(ot->srna, "line", 1, 1, INT_MAX, _("Line"), _("Line number to jump to."), 1, 10000); + RNA_def_int(ot->srna, "line", 1, 1, INT_MAX, "Line", "Line number to jump to.", 1, 10000); } /******************* delete operator **********************/ @@ -2019,16 +2017,16 @@ static int delete_exec(bContext *C, wmOperator *op) void TEXT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Delete"); + ot->name= "Delete"; ot->idname= "TEXT_OT_delete"; - ot->description= _("Delete text by cursor position"); + ot->description= "Delete text by cursor position"; /* api callbacks */ ot->exec= delete_exec; ot->poll= text_edit_poll; /* properties */ - RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, _("Type"), _("Which part of the text to delete.")); + RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete."); } /******************* toggle overwrite operator **********************/ @@ -2047,9 +2045,9 @@ static int toggle_overwrite_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_overwrite_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Toggle Overwrite"); + ot->name= "Toggle Overwrite"; ot->idname= "TEXT_OT_overwrite_toggle"; - ot->description= _("Toggle overwrite while typing"); + ot->description= "Toggle overwrite while typing"; /* api callbacks */ ot->exec= toggle_overwrite_exec; @@ -2247,12 +2245,12 @@ static int scroll_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_scroll(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scroll"); + ot->name= "Scroll"; /*don't really see the difference between this and scroll_bar. Both do basically the same thing (aside from keymaps).*/ ot->idname= "TEXT_OT_scroll"; - ot->description= _("Scroll text screen"); + ot->description= "Scroll text screen"; /* api callbacks */ ot->exec= scroll_exec; @@ -2265,7 +2263,7 @@ void TEXT_OT_scroll(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; /* properties */ - RNA_def_int(ot->srna, "lines", 1, INT_MIN, INT_MAX, _("Lines"), _("Number of lines to scroll."), -100, 100); + RNA_def_int(ot->srna, "lines", 1, INT_MIN, INT_MAX, "Lines", "Number of lines to scroll.", -100, 100); } /******************** scroll bar operator *******************/ @@ -2330,12 +2328,12 @@ static int scroll_bar_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_scroll_bar(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Scrollbar"); + ot->name= "Scrollbar"; /*don't really see the difference between this and scroll. Both do basically the same thing (aside from keymaps).*/ ot->idname= "TEXT_OT_scroll_bar"; - ot->description= _("Scroll text screen"); + ot->description= "Scroll text screen"; /* api callbacks */ ot->invoke= scroll_bar_invoke; @@ -2347,7 +2345,7 @@ void TEXT_OT_scroll_bar(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* properties */ - RNA_def_int(ot->srna, "lines", 1, INT_MIN, INT_MAX, _("Lines"), _("Number of lines to scroll."), -100, 100); + RNA_def_int(ot->srna, "lines", 1, INT_MIN, INT_MAX, "Lines", "Number of lines to scroll.", -100, 100); } /******************* set selection operator **********************/ @@ -2627,9 +2625,9 @@ static int set_selection_cancel(bContext *C, wmOperator *op) void TEXT_OT_selection_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Selection"); + ot->name= "Set Selection"; ot->idname= "TEXT_OT_selection_set"; - ot->description= _("Set cursor selection"); + ot->description= "Set cursor selection"; /* api callbacks */ ot->invoke= set_selection_invoke; @@ -2638,7 +2636,7 @@ void TEXT_OT_selection_set(wmOperatorType *ot) ot->poll= text_region_edit_poll; /* properties */ - RNA_def_boolean(ot->srna, "select", 0, _("Select"), _("Set selection end rather than cursor.")); + RNA_def_boolean(ot->srna, "select", 0, "Select", "Set selection end rather than cursor."); } /******************* set cursor operator **********************/ @@ -2681,9 +2679,9 @@ static int set_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Cursor"); + ot->name= "Set Cursor"; ot->idname= "TEXT_OT_cursor_set"; - ot->description= _("Set cursor position"); + ot->description= "Set cursor position"; /* api callbacks */ ot->invoke= set_cursor_invoke; @@ -2737,9 +2735,9 @@ static int line_number_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *even void TEXT_OT_line_number(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Line Number"); + ot->name= "Line Number"; ot->idname= "TEXT_OT_line_number"; - ot->description= _("The current line number"); + ot->description= "The current line number"; /* api callbacks */ ot->invoke= line_number_invoke; @@ -2812,9 +2810,9 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) void TEXT_OT_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Insert"); + ot->name= "Insert"; ot->idname= "TEXT_OT_insert"; - ot->description= _("Insert text at cursor position"); + ot->description= "Insert text at cursor position"; /* api callbacks */ ot->exec= insert_exec; @@ -2822,7 +2820,7 @@ void TEXT_OT_insert(wmOperatorType *ot) ot->poll= text_edit_poll; /* properties */ - RNA_def_string(ot->srna, "text", "", 0, _("Text"), _("Text to insert at the cursor position.")); + RNA_def_string(ot->srna, "text", "", 0, "Text", "Text to insert at the cursor position."); } /******************* find operator *********************/ @@ -2931,9 +2929,9 @@ static int find_exec(bContext *C, wmOperator *op) void TEXT_OT_find(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Find"); + ot->name= "Find"; ot->idname= "TEXT_OT_find"; - ot->description= _("Find specified text"); + ot->description= "Find specified text"; /* api callbacks */ ot->exec= find_exec; @@ -2950,9 +2948,9 @@ static int replace_exec(bContext *C, wmOperator *op) void TEXT_OT_replace(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Replace"); + ot->name= "Replace"; ot->idname= "TEXT_OT_replace"; - ot->description= _("Replace text with the specified text"); + ot->description= "Replace text with the specified text"; /* api callbacks */ ot->exec= replace_exec; @@ -2969,9 +2967,9 @@ static int mark_all_exec(bContext *C, wmOperator *op) void TEXT_OT_mark_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Mark All"); + ot->name= "Mark All"; ot->idname= "TEXT_OT_mark_all"; - ot->description= _("Mark all specified text"); + ot->description= "Mark all specified text"; /* api callbacks */ ot->exec= mark_all_exec; @@ -2999,9 +2997,9 @@ static int find_set_selected_exec(bContext *C, wmOperator *op) void TEXT_OT_find_set_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Find Set Selected"); + ot->name= "Find Set Selected"; ot->idname= "TEXT_OT_find_set_selected"; - ot->description= _("Find specified text and set as selected"); + ot->description= "Find specified text and set as selected"; /* api callbacks */ ot->exec= find_set_selected_exec; @@ -3026,9 +3024,9 @@ static int replace_set_selected_exec(bContext *C, wmOperator *UNUSED(op)) void TEXT_OT_replace_set_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Replace Set Selected"); + ot->name= "Replace Set Selected"; ot->idname= "TEXT_OT_replace_set_selected"; - ot->description= _("Replace text with specified text and set as selected"); + ot->description= "Replace text with specified text and set as selected"; /* api callbacks */ ot->exec= replace_set_selected_exec; @@ -3161,9 +3159,9 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void TEXT_OT_resolve_conflict(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Resolve Conflict"); + ot->name= "Resolve Conflict"; ot->idname= "TEXT_OT_resolve_conflict"; - ot->description= _("When external text is out of sync, resolve the conflict"); + ot->description= "When external text is out of sync, resolve the conflict"; /* api callbacks */ ot->exec= resolve_conflict_exec; @@ -3171,7 +3169,7 @@ void TEXT_OT_resolve_conflict(wmOperatorType *ot) ot->poll= save_poll; /* properties */ - RNA_def_enum(ot->srna, "resolution", resolution_items, RESOLVE_IGNORE, _("Resolution"), _("How to solve conflict due to different in internal and external text.")); + RNA_def_enum(ot->srna, "resolution", resolution_items, RESOLVE_IGNORE, "Resolution", "How to solve conflict due to different in internal and external text."); } /********************** to 3d object operator *****************/ @@ -3189,9 +3187,9 @@ static int to_3d_object_exec(bContext *C, wmOperator *op) void TEXT_OT_to_3d_object(wmOperatorType *ot) { /* identifiers */ - ot->name= _("To 3D Object"); + ot->name= "To 3D Object"; ot->idname= "TEXT_OT_to_3d_object"; - ot->description= _("Create 3d text object from active text data block"); + ot->description= "Create 3d text object from active text data block"; /* api callbacks */ ot->exec= to_3d_object_exec; @@ -3201,7 +3199,7 @@ void TEXT_OT_to_3d_object(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "split_lines", 0, _("Split Lines"), _("Create one object per line in the text.")); + RNA_def_boolean(ot->srna, "split_lines", 0, "Split Lines", "Create one object per line in the text."); } diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index d6bf4a551ce..758d1e629f9 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript index ec59d774f65..c08339ba692 100644 --- a/source/blender/editors/space_time/SConscript +++ b/source/blender/editors/space_time/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna ../../blenloader' diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c index 538443fb9c7..78d903a2997 100644 --- a/source/blender/editors/space_time/time_ops.c +++ b/source/blender/editors/space_time/time_ops.c @@ -37,8 +37,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "ED_screen.h" @@ -77,9 +75,9 @@ static int time_set_sfra_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_start_frame_set (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Start Frame"); + ot->name= "Set Start Frame"; ot->idname= "TIME_OT_start_frame_set"; - ot->description=_("Set the start frame"); + ot->description="Set the start frame"; /* api callbacks */ ot->exec= time_set_sfra_exec; @@ -119,9 +117,9 @@ static int time_set_efra_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_end_frame_set (wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set End Frame"); + ot->name= "Set End Frame"; ot->idname= "TIME_OT_end_frame_set"; - ot->description=_("Set the end frame"); + ot->description="Set the end frame"; /* api callbacks */ ot->exec= time_set_efra_exec; @@ -161,9 +159,9 @@ static int time_view_all_exec (bContext *C, wmOperator *UNUSED(op)) static void TIME_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); + ot->name= "View All"; ot->idname= "TIME_OT_view_all"; - ot->description= _("Show the entire playable frame range"); + ot->description= "Show the entire playable frame range"; /* api callbacks */ ot->exec= time_view_all_exec; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 67e523ec355..50c587194b7 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -52,8 +52,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_action.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -1471,8 +1469,8 @@ static int view3d_properties(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_properties(wmOperatorType *ot) { - ot->name= _("Properties"); - ot->description= _("Toggles the properties panel display"); + ot->name= "Properties"; + ot->description= "Toggles the properties panel display"; ot->idname= "VIEW3D_OT_properties"; ot->exec= view3d_properties; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index af08690b869..761de836cfb 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -49,8 +49,6 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_image.h" #include "BKE_library.h" @@ -579,13 +577,13 @@ enum { void viewrotate_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, - {VIEWROT_MODAL_AXIS_SNAP_ENABLE, "AXIS_SNAP_ENABLE", 0, N_("Enable Axis Snap"), ""}, - {VIEWROT_MODAL_AXIS_SNAP_DISABLE, "AXIS_SNAP_DISABLE", 0, N_("Disable Axis Snap"), ""}, + {VIEWROT_MODAL_AXIS_SNAP_ENABLE, "AXIS_SNAP_ENABLE", 0, "Enable Axis Snap", ""}, + {VIEWROT_MODAL_AXIS_SNAP_DISABLE, "AXIS_SNAP_DISABLE", 0, "Disable Axis Snap", ""}, - {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, N_("Switch to Zoom")}, - {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, N_("Switch to Move")}, + {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, "Switch to Zoom"}, + {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"}, {0, NULL, 0, NULL, NULL}}; @@ -594,7 +592,7 @@ void viewrotate_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, _("View3D Rotate Modal"), RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "View3D Rotate Modal", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -922,8 +920,8 @@ void VIEW3D_OT_rotate(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Rotate view"); - ot->description = _("Rotate the view"); + ot->name= "Rotate view"; + ot->description = "Rotate the view"; ot->idname= "VIEW3D_OT_rotate"; /* api callbacks */ @@ -1218,10 +1216,10 @@ void VIEW3D_OT_ndof_pan(struct wmOperatorType *ot) void viewmove_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, - {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, N_("Switch to Zoom")}, - {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, N_("Switch to Rotate")}, + {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, "Switch to Zoom"}, + {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, "Switch to Rotate"}, {0, NULL, 0, NULL, NULL}}; @@ -1230,7 +1228,7 @@ void viewmove_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, _("View3D Move Modal"), RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "View3D Move Modal", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -1357,8 +1355,8 @@ void VIEW3D_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Move view"); - ot->description = _("Move the view"); + ot->name= "Move view"; + ot->description = "Move the view"; ot->idname= "VIEW3D_OT_move"; /* api callbacks */ @@ -1378,10 +1376,10 @@ void VIEW3D_OT_move(wmOperatorType *ot) void viewzoom_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, - {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, N_("Switch to Rotate")}, - {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, N_("Switch to Move")}, + {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, "Switch to Rotate"}, + {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"}, {0, NULL, 0, NULL, NULL}}; @@ -1390,7 +1388,7 @@ void viewzoom_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, _("View3D Zoom Modal"), RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "View3D Zoom Modal", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -1629,10 +1627,10 @@ static int viewzoom_exec(bContext *C, wmOperator *op) void viewdolly_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, - {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, N_("Switch to Rotate")}, - {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, N_("Switch to Move")}, + {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, "Switch to Rotate"}, + {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"}, {0, NULL, 0, NULL, NULL}}; @@ -1641,7 +1639,7 @@ void viewdolly_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, _("View3D Dolly Modal"), RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "View3D Dolly Modal", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -1719,8 +1717,8 @@ static int viewzoom_cancel(bContext *C, wmOperator *op) void VIEW3D_OT_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Zoom View"); - ot->description = _("Zoom in/out in the view"); + ot->name= "Zoom View"; + ot->description = "Zoom in/out in the view"; ot->idname= "VIEW3D_OT_zoom"; /* api callbacks */ @@ -1733,9 +1731,9 @@ void VIEW3D_OT_zoom(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; - RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, _("Delta"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, _("Zoom Position X"), "", 0, INT_MAX); - RNA_def_int(ot->srna, "my", 0, 0, INT_MAX, _("Zoom Position Y"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, "Zoom Position X", "", 0, INT_MAX); + RNA_def_int(ot->srna, "my", 0, 0, INT_MAX, "Zoom Position Y", "", 0, INT_MAX); } @@ -1952,8 +1950,8 @@ static int viewdolly_cancel(bContext *C, wmOperator *op) void VIEW3D_OT_dolly(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Dolly view"); - ot->description = _("Dolly in/out in the view"); + ot->name= "Dolly view"; + ot->description = "Dolly in/out in the view"; ot->idname= "VIEW3D_OT_dolly"; /* api callbacks */ @@ -1966,9 +1964,9 @@ void VIEW3D_OT_dolly(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; - RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, _("Delta"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, _("Zoom Position X"), "", 0, INT_MAX); - RNA_def_int(ot->srna, "my", 0, 0, INT_MAX, _("Zoom Position Y"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "mx", 0, 0, INT_MAX, "Zoom Position X", "", 0, INT_MAX); + RNA_def_int(ot->srna, "my", 0, 0, INT_MAX, "Zoom Position Y", "", 0, INT_MAX); } @@ -2061,8 +2059,8 @@ static int view3d_all_exec(bContext *C, wmOperator *op) /* was view3d_home() in void VIEW3D_OT_view_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View All"); - ot->description = _("View all objects in scene"); + ot->name= "View All"; + ot->description = "View all objects in scene"; ot->idname= "VIEW3D_OT_view_all"; /* api callbacks */ @@ -2072,7 +2070,7 @@ void VIEW3D_OT_view_all(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_boolean(ot->srna, "center", 0, _("Center"), ""); + RNA_def_boolean(ot->srna, "center", 0, "Center", ""); } @@ -2208,8 +2206,8 @@ void VIEW3D_OT_view_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Selected"); - ot->description = _("Move the view to the selection center"); + ot->name= "View Selected"; + ot->description = "Move the view to the selection center"; ot->idname= "VIEW3D_OT_view_selected"; /* api callbacks */ @@ -2243,8 +2241,8 @@ static int viewcenter_cursor_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_view_center_cursor(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Center View to Cursor"); - ot->description= _("Centers the view so that the cursor is in the middle of the view"); + ot->name= "Center View to Cursor"; + ot->description= "Centers the view so that the cursor is in the middle of the view"; ot->idname= "VIEW3D_OT_view_center_cursor"; /* api callbacks */ @@ -2282,8 +2280,8 @@ static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was void VIEW3D_OT_view_center_camera(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Camera Center"); - ot->description = _("Center the camera view"); + ot->name= "View Camera Center"; + ot->description = "Center the camera view"; ot->idname= "VIEW3D_OT_view_center_camera"; /* api callbacks */ @@ -2347,8 +2345,8 @@ static int render_border_exec(bContext *C, wmOperator *op) void VIEW3D_OT_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Render Border"); - ot->description = _("Set the boundaries of the border render and enables border render "); + ot->name= "Set Render Border"; + ot->description = "Set the boundaries of the border render and enables border render "; ot->idname= "VIEW3D_OT_render_border"; /* api callbacks */ @@ -2363,10 +2361,10 @@ void VIEW3D_OT_render_border(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* rna */ - RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, _("X Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, _("X Max"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, _("Y Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, _("Y Max"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); } /* ********************* Border Zoom operator ****************** */ @@ -2503,8 +2501,8 @@ static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, wmEvent *event void VIEW3D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Zoom"); - ot->description = _("Zoom in the view to the nearest object contained in the border"); + ot->name= "Border Zoom"; + ot->description = "Zoom in the view to the nearest object contained in the border"; ot->idname= "VIEW3D_OT_zoom_border"; /* api callbacks */ @@ -2519,10 +2517,10 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot) ot->flag= 0; /* rna */ - RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, _("X Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, _("X Max"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, _("Y Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, _("Y Max"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); } @@ -2554,8 +2552,8 @@ static int view3d_zoom_1_to_1_camera_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Zoom Camera 1:1"); - ot->description = _("Match the camera to 1:1 to the render output"); + ot->name= "Zoom Camera 1:1"; + ot->description = "Match the camera to 1:1 to the render output"; ot->idname= "VIEW3D_OT_zoom_camera_1_to_1"; /* api callbacks */ @@ -2569,13 +2567,13 @@ void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot) /* ********************* Changing view operator ****************** */ static EnumPropertyItem prop_view_items[] = { - {RV3D_VIEW_FRONT, "FRONT", 0, N_("Front"), N_("View From the Front")}, - {RV3D_VIEW_BACK, "BACK", 0, N_("Back"), N_("View From the Back")}, - {RV3D_VIEW_LEFT, "LEFT", 0, N_("Left"), N_("View From the Left")}, - {RV3D_VIEW_RIGHT, "RIGHT", 0, N_("Right"), N_("View From the Right")}, - {RV3D_VIEW_TOP, "TOP", 0, N_("Top"), N_("View From the Top")}, - {RV3D_VIEW_BOTTOM, "BOTTOM", 0, N_("Bottom"), N_("View From the Bottom")}, - {RV3D_VIEW_CAMERA, "CAMERA", 0, N_("Camera"), N_("View From the active amera")}, + {RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"}, + {RV3D_VIEW_BACK, "BACK", 0, "Back", "View From the Back"}, + {RV3D_VIEW_LEFT, "LEFT", 0, "Left", "View From the Left"}, + {RV3D_VIEW_RIGHT, "RIGHT", 0, "Right", "View From the Right"}, + {RV3D_VIEW_TOP, "TOP", 0, "Top", "View From the Top"}, + {RV3D_VIEW_BOTTOM, "BOTTOM", 0, "Bottom", "View From the Bottom"}, + {RV3D_VIEW_CAMERA, "CAMERA", 0, "Camera", "View From the active amera"}, {0, NULL, 0, NULL, NULL}}; @@ -2776,8 +2774,8 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) void VIEW3D_OT_viewnumpad(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View numpad"); - ot->description = _("Set the view"); + ot->name= "View numpad"; + ot->description = "Set the view"; ot->idname= "VIEW3D_OT_viewnumpad"; /* api callbacks */ @@ -2787,15 +2785,15 @@ void VIEW3D_OT_viewnumpad(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_enum(ot->srna, "type", prop_view_items, 0, _("View"), _("The Type of view")); - RNA_def_boolean(ot->srna, "align_active", 0, _("Align Active"), _("Align to the active objects axis")); + RNA_def_enum(ot->srna, "type", prop_view_items, 0, "View", "The Type of view"); + RNA_def_boolean(ot->srna, "align_active", 0, "Align Active", "Align to the active objects axis"); } static EnumPropertyItem prop_view_orbit_items[] = { - {V3D_VIEW_STEPLEFT, "ORBITLEFT", 0, N_("Orbit Left"), N_("Orbit the view around to the Left")}, - {V3D_VIEW_STEPRIGHT, "ORBITRIGHT", 0, N_("Orbit Right"), N_("Orbit the view around to the Right")}, - {V3D_VIEW_STEPUP, "ORBITUP", 0, N_("Orbit Up"), N_("Orbit the view Up")}, - {V3D_VIEW_STEPDOWN, "ORBITDOWN", 0, N_("Orbit Down"), N_("Orbit the view Down")}, + {V3D_VIEW_STEPLEFT, "ORBITLEFT", 0, "Orbit Left", "Orbit the view around to the Left"}, + {V3D_VIEW_STEPRIGHT, "ORBITRIGHT", 0, "Orbit Right", "Orbit the view around to the Right"}, + {V3D_VIEW_STEPUP, "ORBITUP", 0, "Orbit Up", "Orbit the view Up"}, + {V3D_VIEW_STEPDOWN, "ORBITDOWN", 0, "Orbit Down", "Orbit the view Down"}, {0, NULL, 0, NULL, NULL}}; static int vieworbit_exec(bContext *C, wmOperator *op) @@ -2845,8 +2843,8 @@ static int vieworbit_exec(bContext *C, wmOperator *op) void VIEW3D_OT_view_orbit(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Orbit"); - ot->description = _("Orbit the view"); + ot->name= "View Orbit"; + ot->description = "Orbit the view"; ot->idname= "VIEW3D_OT_view_orbit"; /* api callbacks */ @@ -2855,14 +2853,14 @@ void VIEW3D_OT_view_orbit(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_view_orbit_items), 0, _("Orbit"), _("Direction of View Orbit")); + RNA_def_enum(ot->srna, "type", prop_view_orbit_items, 0, "Orbit", "Direction of View Orbit"); } static EnumPropertyItem prop_view_pan_items[] = { - {V3D_VIEW_PANLEFT, "PANLEFT", 0, N_("Pan Left"), N_("Pan the view to the Left")}, - {V3D_VIEW_PANRIGHT, "PANRIGHT", 0, N_("Pan Right"), N_("Pan the view to the Right")}, - {V3D_VIEW_PANUP, "PANUP", 0, N_("Pan Up"), N_("Pan the view Up")}, - {V3D_VIEW_PANDOWN, "PANDOWN", 0, N_("Pan Down"), N_("Pan the view Down")}, + {V3D_VIEW_PANLEFT, "PANLEFT", 0, "Pan Left", "Pan the view to the Left"}, + {V3D_VIEW_PANRIGHT, "PANRIGHT", 0, "Pan Right", "Pan the view to the Right"}, + {V3D_VIEW_PANUP, "PANUP", 0, "Pan Up", "Pan the view Up"}, + {V3D_VIEW_PANDOWN, "PANDOWN", 0, "Pan Down", "Pan the view Down"}, {0, NULL, 0, NULL, NULL}}; static int viewpan_exec(bContext *C, wmOperator *op) @@ -2893,8 +2891,8 @@ static int viewpan_exec(bContext *C, wmOperator *op) void VIEW3D_OT_view_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Pan"); - ot->description = _("Pan the view"); + ot->name= "View Pan"; + ot->description = "Pan the view"; ot->idname= "VIEW3D_OT_view_pan"; /* api callbacks */ @@ -2903,7 +2901,7 @@ void VIEW3D_OT_view_pan(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_view_pan_items), 0, _("Pan"), _("Direction of View Pan")); + RNA_def_enum(ot->srna, "type", prop_view_pan_items, 0, "Pan", "Direction of View Pan"); } static int viewpersportho_exec(bContext *C, wmOperator *UNUSED(op)) @@ -2925,8 +2923,8 @@ static int viewpersportho_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_view_persportho(wmOperatorType *ot) { /* identifiers */ - ot->name= _("View Persp/Ortho"); - ot->description = _("Switch the current view from perspective/orthographic"); + ot->name= "View Persp/Ortho"; + ot->description = "Switch the current view from perspective/orthographic"; ot->idname= "VIEW3D_OT_view_persportho"; /* api callbacks */ @@ -3002,8 +3000,8 @@ static int background_image_add_invoke(bContext *C, wmOperator *op, wmEvent *UNU void VIEW3D_OT_background_image_add(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Add Background Image"); - ot->description= _("Add a new background image"); + ot->name = "Add Background Image"; + ot->description= "Add a new background image"; ot->idname = "VIEW3D_OT_background_image_add"; /* api callbacks */ @@ -3015,8 +3013,8 @@ void VIEW3D_OT_background_image_add(wmOperatorType *ot) ot->flag = 0; /* properties */ - RNA_def_string(ot->srna, "name", "Image", 24, _("Name"), _("Image name to assign.")); - RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, _("Filepath"), _("Path to image file")); + RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Image name to assign."); + RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath", "Path to image file"); } @@ -3043,8 +3041,8 @@ static int background_image_remove_exec(bContext *C, wmOperator *op) void VIEW3D_OT_background_image_remove(wmOperatorType *ot) { /* identifiers */ - ot->name = _("Remove Background Image"); - ot->description= _("Remove a background image from the 3D view"); + ot->name = "Remove Background Image"; + ot->description= "Remove a background image from the 3D view"; ot->idname = "VIEW3D_OT_background_image_remove"; /* api callbacks */ @@ -3054,7 +3052,7 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot) /* flags */ ot->flag = 0; - RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, _("Index"), _("Background image index to remove "), 0, INT_MAX); + RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Background image index to remove ", 0, INT_MAX); } /* ********************* set clipping operator ****************** */ @@ -3142,8 +3140,8 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Clipping Border"); - ot->description = _("Set the view clipping border"); + ot->name= "Clipping Border"; + ot->description = "Set the view clipping border"; ot->idname= "VIEW3D_OT_clip_border"; /* api callbacks */ @@ -3158,10 +3156,10 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) ot->flag= 0; /* rna */ - RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, _("X Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, _("X Max"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, _("Y Min"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, _("Y Max"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); } /* ***************** 3d cursor cursor op ******************* */ @@ -3235,8 +3233,8 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set 3D Cursor"); - ot->description = _("Set the location of the 3D cursor"); + ot->name= "Set 3D Cursor"; + ot->description = "Set the location of the 3D cursor"; ot->idname= "VIEW3D_OT_cursor3d"; /* api callbacks */ @@ -3277,8 +3275,8 @@ void VIEW3D_OT_manipulator(wmOperatorType *ot) { /* identifiers */ - ot->name= _("3D Manipulator"); - ot->description = _("Manipulate selected item by axis"); + ot->name= "3D Manipulator"; + ot->description = "Manipulate selected item by axis"; ot->idname= "VIEW3D_OT_manipulator"; /* api callbacks */ @@ -3311,8 +3309,8 @@ static int enable_manipulator_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void VIEW3D_OT_enable_manipulator(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Enable 3D Manipulator"); - ot->description = _("Enable the transform manipulator for use"); + ot->name= "Enable 3D Manipulator"; + ot->description = "Enable the transform manipulator for use"; ot->idname= "VIEW3D_OT_enable_manipulator"; /* api callbacks */ @@ -3320,9 +3318,9 @@ void VIEW3D_OT_enable_manipulator(wmOperatorType *ot) ot->poll= ED_operator_view3d_active; /* rna later */ - RNA_def_boolean(ot->srna, "translate", 0, _("Translate"), _("Enable the translate manipulator")); - RNA_def_boolean(ot->srna, "rotate", 0, _("Rotate"), _("Enable the rotate manipulator")); - RNA_def_boolean(ot->srna, "scale", 0, _("Scale"), _("Enable the scale manipulator")); + RNA_def_boolean(ot->srna, "translate", 0, "Translate", "Enable the translate manipulator"); + RNA_def_boolean(ot->srna, "rotate", 0, "Rotate", "Enable the rotate manipulator"); + RNA_def_boolean(ot->srna, "scale", 0, "Scale", "Enable the scale manipulator"); } /* ************************* below the line! *********************** */ diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 6835054a92c..30d1a508888 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -42,10 +42,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLF_api.h" -#include "RNA_define.h" -#include "RNA_access.h" - #include "BKE_context.h" #include "BKE_object.h" #include "BKE_report.h" @@ -87,26 +83,26 @@ void fly_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {FLY_MODAL_CANCEL, "CANCEL", 0, N_("Cancel"), ""}, - {FLY_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, - {FLY_MODAL_ACCELERATE, "ACCELERATE", 0, N_("Accelerate"), ""}, - {FLY_MODAL_DECELERATE, "DECELERATE", 0, N_("Decelerate"), ""}, + {FLY_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, + {FLY_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, + {FLY_MODAL_ACCELERATE, "ACCELERATE", 0, "Accelerate", ""}, + {FLY_MODAL_DECELERATE, "DECELERATE", 0, "Decelerate", ""}, - {FLY_MODAL_PAN_ENABLE, "PAN_ENABLE", 0, N_("Pan Enable"), ""}, - {FLY_MODAL_PAN_DISABLE, "PAN_DISABLE", 0, N_("Pan Disable"), ""}, + {FLY_MODAL_PAN_ENABLE, "PAN_ENABLE", 0, "Pan Enable", ""}, + {FLY_MODAL_PAN_DISABLE, "PAN_DISABLE", 0, "Pan Disable", ""}, - {FLY_MODAL_DIR_FORWARD, "FORWARD", 0, N_("Fly Forward"), ""}, - {FLY_MODAL_DIR_BACKWARD,"BACKWARD", 0, N_("Fly Backward"), ""}, - {FLY_MODAL_DIR_LEFT, "LEFT", 0, N_("Fly Left"), ""}, - {FLY_MODAL_DIR_RIGHT, "RIGHT", 0, N_("Fly Right"), ""}, - {FLY_MODAL_DIR_UP, "UP", 0, N_("Fly Up"), ""}, - {FLY_MODAL_DIR_DOWN, "DOWN", 0, N_("Fly Down"), ""}, + {FLY_MODAL_DIR_FORWARD, "FORWARD", 0, "Fly Forward", ""}, + {FLY_MODAL_DIR_BACKWARD,"BACKWARD", 0, "Fly Backward", ""}, + {FLY_MODAL_DIR_LEFT, "LEFT", 0, "Fly Left", ""}, + {FLY_MODAL_DIR_RIGHT, "RIGHT", 0, "Fly Right", ""}, + {FLY_MODAL_DIR_UP, "UP", 0, "Fly Up", ""}, + {FLY_MODAL_DIR_DOWN, "DOWN", 0, "Fly Down", ""}, - {FLY_MODAL_AXIS_LOCK_X, "AXIS_LOCK_X", 0, N_("X Axis Correction"), N_("X axis correction (toggle)")}, - {FLY_MODAL_AXIS_LOCK_Z, "AXIS_LOCK_Z", 0, N_("X Axis Correction"), N_("Z axis correction (toggle)")}, + {FLY_MODAL_AXIS_LOCK_X, "AXIS_LOCK_X", 0, "X Axis Correction", "X axis correction (toggle)"}, + {FLY_MODAL_AXIS_LOCK_Z, "AXIS_LOCK_Z", 0, "X Axis Correction", "Z axis correction (toggle)"}, - {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, N_("Precision Enable"), ""}, - {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, N_("Precision Disable"), ""}, + {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, "Precision Enable", ""}, + {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, "Precision Disable", ""}, {0, NULL, 0, NULL, NULL}}; @@ -115,7 +111,7 @@ void fly_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if (keymap) return; - keymap= WM_modalkeymap_add(keyconf, "View3D Fly Modal", RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "View3D Fly Modal", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CANCEL); @@ -1152,8 +1148,8 @@ static int fly_modal(bContext *C, wmOperator *op, wmEvent *event) void VIEW3D_OT_fly(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Fly Navigation"); - ot->description= _("Interactively fly around the scene"); + ot->name= "Fly Navigation"; + ot->description= "Interactively fly around the scene"; ot->idname= "VIEW3D_OT_fly"; /* api callbacks */ diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index ec323a24a0c..86f2af5f942 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -254,8 +254,8 @@ static int view3d_layers_poll(bContext *C) void VIEW3D_OT_layers(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Layers"); - ot->description= _("Toggle layer(s) visibility"); + ot->name= "Layers"; + ot->description= "Toggle layer(s) visibility"; ot->idname= "VIEW3D_OT_layers"; /* api callbacks */ @@ -266,9 +266,9 @@ void VIEW3D_OT_layers(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_int(ot->srna, "nr", 1, 0, 20, _("Number"), _("The layer number to set, zero for all layers"), 0, 20); - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Add this layer to the current view layers")); - RNA_def_boolean(ot->srna, "toggle", 1, _("Toggle"), _("Toggle the layer")); + RNA_def_int(ot->srna, "nr", 1, 0, 20, "Number", "The layer number to set, zero for all layers", 0, 20); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Add this layer to the current view layers"); + RNA_def_boolean(ot->srna, "toggle", 1, "Toggle", "Toggle the layer"); } static char *view3d_modeselect_pup(Scene *scene) diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index a8f91f86a4f..65914ead899 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -54,8 +54,6 @@ #include "BLI_linklist.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_paint.h" #include "BKE_armature.h" @@ -864,8 +862,8 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_lasso(wmOperatorType *ot) { - ot->name= _("Lasso Select"); - ot->description= _("Select items using lasso selection"); + ot->name= "Lasso Select"; + ot->description= "Select items using lasso selection"; ot->idname= "VIEW3D_OT_select_lasso"; ot->invoke= WM_gesture_lasso_invoke; @@ -878,8 +876,8 @@ void VIEW3D_OT_select_lasso(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", ""); - RNA_def_boolean(ot->srna, "deselect", 0, _("Deselect"), _("Deselect rather than select items.")); - RNA_def_boolean(ot->srna, "extend", 1, _("Extend"), _("Extend selection instead of deselecting everything first.")); + RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect rather than select items."); + RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection instead of deselecting everything first."); } @@ -1818,8 +1816,8 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); - ot->description= _("Select items using border selection"); + ot->name= "Border Select"; + ot->description= "Select items using border selection"; ot->idname= "VIEW3D_OT_select_border"; /* api callbacks */ @@ -1895,8 +1893,8 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event) void VIEW3D_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Activate/Select"); - ot->description= _("Activate/select item(s)"); + ot->name= "Activate/Select"; + ot->description= "Activate/select item(s)"; ot->idname= "VIEW3D_OT_select"; /* api callbacks */ @@ -1907,10 +1905,10 @@ void VIEW3D_OT_select(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "extend", 0, _("Extend"), _("Extend selection instead of deselecting everything first.")); - RNA_def_boolean(ot->srna, "center", 0, _("Center"), _("Use the object center when selecting, in editmode used to extend object selection.")); - RNA_def_boolean(ot->srna, "enumerate", 0, _("Enumerate"), _("List objects under the mouse (object mode only).")); - RNA_def_boolean(ot->srna, "object", 0, _("Object"), _("Use object selection (editmode only).")); + RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first."); + RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting, in editmode used to extend object selection."); + RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)."); + RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (editmode only)."); } @@ -2311,8 +2309,8 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_circle(wmOperatorType *ot) { - ot->name= _("Circle Select"); - ot->description= _("Select items using circle selection"); + ot->name= "Circle Select"; + ot->description= "Select items using circle selection"; ot->idname= "VIEW3D_OT_select_circle"; ot->invoke= WM_gesture_circle_invoke; @@ -2326,6 +2324,6 @@ void VIEW3D_OT_select_circle(wmOperatorType *ot) RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, _("Radius"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, _("Event Type"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, "Radius", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX); } diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 05cdc20efcb..ad338cef207 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -82,7 +82,7 @@ static void view3d_panel_operator_redo_header(const bContext *C, Panel *pa) wmOperator *op= WM_operator_last_redo(C); if(op) BLI_strncpy(pa->drawname, op->type->name, sizeof(pa->drawname)); - else BLI_strncpy(pa->drawname, _("Operator"), sizeof(pa->drawname)); + else BLI_strncpy(pa->drawname, N_("Operator"), sizeof(pa->drawname)); } static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOperator *op) @@ -259,8 +259,8 @@ static int view3d_toolshelf(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_toolshelf(wmOperatorType *ot) { - ot->name= _("Tool Shelf"); - ot->description= _("Toggles tool shelf display"); + ot->name= "Tool Shelf"; + ot->description= "Toggles tool shelf display"; ot->idname= "VIEW3D_OT_toolshelf"; ot->exec= view3d_toolshelf; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index b1641da7608..44ae6837aa2 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -43,8 +43,6 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_anim.h" #include "BKE_action.h" #include "BKE_context.h" @@ -358,9 +356,9 @@ void VIEW3D_OT_smoothview(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Smooth View"); + ot->name= "Smooth View"; ot->idname= "VIEW3D_OT_smoothview"; - ot->description=_("The time to animate the change of view (in milliseconds)"); + ot->description="The time to animate the change of view (in milliseconds)"; /* api callbacks */ ot->invoke= view3d_smoothview_invoke; @@ -408,8 +406,8 @@ void VIEW3D_OT_setcameratoview(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Align Camera To View"); - ot->description= _("Set camera view to active view"); + ot->name= "Align Camera To View"; + ot->description= "Set camera view to active view"; ot->idname= "VIEW3D_OT_camera_to_view"; /* api callbacks */ @@ -454,8 +452,8 @@ void VIEW3D_OT_object_as_camera(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Active Object as Camera"); - ot->description= _("Set the active object as the active camera for this view or scene"); + ot->name= "Set Active Object as Camera"; + ot->description= "Set the active object as the active camera for this view or scene"; ot->idname= "VIEW3D_OT_object_as_camera"; /* api callbacks */ @@ -1620,8 +1618,8 @@ void VIEW3D_OT_localview(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Local View"); - ot->description= _("Toggle display of selected object(s) separately and centered in view"); + ot->name= "Local View"; + ot->description= "Toggle display of selected object(s) separately and centered in view"; ot->idname= "VIEW3D_OT_localview"; /* api callbacks */ @@ -1846,8 +1844,8 @@ void VIEW3D_OT_game_start(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Start Game Engine"); - ot->description= _("Start game engine"); + ot->name= "Start Game Engine"; + ot->description= "Start game engine"; ot->idname= "VIEW3D_OT_game_start"; /* api callbacks */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index ae9acf7efc4..82598e0b5c6 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -53,7 +53,6 @@ #include "DNA_scene_types.h" /* PET modes */ #include "RNA_access.h" -#include "RNA_define.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -86,8 +85,6 @@ #include "BLI_ghash.h" #include "BLI_linklist.h" -#include "BLF_api.h" - #include "UI_resources.h" //#include "blendef.h" @@ -492,29 +489,29 @@ static void view_editmove(unsigned short UNUSED(event)) wmKeyMap* transform_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {TFM_MODAL_CANCEL, "CANCEL", 0, N_("Cancel"), ""}, - {TFM_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, - {TFM_MODAL_TRANSLATE, "TRANSLATE", 0, N_("Translate"), ""}, - {TFM_MODAL_ROTATE, "ROTATE", 0, N_("Rotate"), ""}, - {TFM_MODAL_RESIZE, "RESIZE", 0, N_("Resize"), ""}, - {TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, N_("Invert Snap On"), ""}, - {TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, N_("Invert Snap Off"), ""}, - {TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, N_("Snap Toggle"), ""}, - {TFM_MODAL_AXIS_X, "AXIS_X", 0, N_("Orientation X axis"), ""}, - {TFM_MODAL_AXIS_Y, "AXIS_Y", 0, N_("Orientation Y axis"), ""}, - {TFM_MODAL_AXIS_Z, "AXIS_Z", 0, N_("Orientation Z axis"), ""}, - {TFM_MODAL_PLANE_X, "PLANE_X", 0, N_("Orientation X plane"), ""}, - {TFM_MODAL_PLANE_Y, "PLANE_Y", 0, N_("Orientation Y plane"), ""}, - {TFM_MODAL_PLANE_Z, "PLANE_Z", 0, N_("Orientation Z plane"), ""}, - {TFM_MODAL_CONS_OFF, "CONS_OFF", 0, N_("Remove Constraints"), ""}, - {TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, N_("Add Snap Point"), ""}, - {TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, N_("Remove Last Snap Point"), ""}, - {NUM_MODAL_INCREMENT_UP, "INCREMENT_UP", 0, N_("Numinput Increment Up"), ""}, - {NUM_MODAL_INCREMENT_DOWN, "INCREMENT_DOWN", 0, N_("Numinput Increment Down"), ""}, - {TFM_MODAL_PROPSIZE_UP, "PROPORTIONAL_SIZE_UP", 0, N_("Increase Proportional Influence"), ""}, - {TFM_MODAL_PROPSIZE_DOWN, "PROPORTIONAL_SIZE_DOWN", 0, N_("Decrease Poportional Influence"), ""}, - {TFM_MODAL_AUTOIK_LEN_INC, "AUTOIK_CHAIN_LEN_UP", 0, N_("Increase Max AutoIK Chain Length"), ""}, - {TFM_MODAL_AUTOIK_LEN_DEC, "AUTOIK_CHAIN_LEN_DOWN", 0, N_("Decrease Max AutoIK Chain Length"), ""}, + {TFM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, + {TFM_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, + {TFM_MODAL_TRANSLATE, "TRANSLATE", 0, "Translate", ""}, + {TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""}, + {TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""}, + {TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, "Invert Snap On", ""}, + {TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, "Invert Snap Off", ""}, + {TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap Toggle", ""}, + {TFM_MODAL_AXIS_X, "AXIS_X", 0, "Orientation X axis", ""}, + {TFM_MODAL_AXIS_Y, "AXIS_Y", 0, "Orientation Y axis", ""}, + {TFM_MODAL_AXIS_Z, "AXIS_Z", 0, "Orientation Z axis", ""}, + {TFM_MODAL_PLANE_X, "PLANE_X", 0, "Orientation X plane", ""}, + {TFM_MODAL_PLANE_Y, "PLANE_Y", 0, "Orientation Y plane", ""}, + {TFM_MODAL_PLANE_Z, "PLANE_Z", 0, "Orientation Z plane", ""}, + {TFM_MODAL_CONS_OFF, "CONS_OFF", 0, "Remove Constraints", ""}, + {TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, "Add Snap Point", ""}, + {TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, "Remove Last Snap Point", ""}, + {NUM_MODAL_INCREMENT_UP, "INCREMENT_UP", 0, "Numinput Increment Up", ""}, + {NUM_MODAL_INCREMENT_DOWN, "INCREMENT_DOWN", 0, "Numinput Increment Down", ""}, + {TFM_MODAL_PROPSIZE_UP, "PROPORTIONAL_SIZE_UP", 0, "Increase Proportional Influence", ""}, + {TFM_MODAL_PROPSIZE_DOWN, "PROPORTIONAL_SIZE_DOWN", 0, "Decrease Poportional Influence", ""}, + {TFM_MODAL_AUTOIK_LEN_INC, "AUTOIK_CHAIN_LEN_UP", 0, "Increase Max AutoIK Chain Length", ""}, + {TFM_MODAL_AUTOIK_LEN_DEC, "AUTOIK_CHAIN_LEN_DOWN", 0, "Decrease Max AutoIK Chain Length", ""}, {0, NULL, 0, NULL, NULL}}; wmKeyMap *keymap= WM_modalkeymap_get(keyconf, "Transform Modal Map"); @@ -522,7 +519,7 @@ wmKeyMap* transform_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return NULL; - keymap= WM_modalkeymap_add(keyconf, "Transform Modal Map", RNA_enum_items_gettexted(modal_items)); + keymap= WM_modalkeymap_add(keyconf, "Transform Modal Map", modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, TFM_MODAL_CANCEL); diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index b9ccb02ff5b..e35b8adc570 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -38,8 +38,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_global.h" #include "BKE_armature.h" @@ -114,34 +112,34 @@ static TransformModeItem transform_modes[] = EnumPropertyItem transform_mode_types[] = { - {TFM_INIT, "INIT", 0, N_("Init"), ""}, - {TFM_DUMMY, "DUMMY", 0, N_("Dummy"), ""}, - {TFM_TRANSLATION, "TRANSLATION", 0, N_("Translation"), ""}, - {TFM_ROTATION, "ROTATION", 0, N_("Rotation"), ""}, - {TFM_RESIZE, "RESIZE", 0, N_("Resize"), ""}, - {TFM_TOSPHERE, "TOSPHERE", 0, N_("Tosphere"), ""}, - {TFM_SHEAR, "SHEAR", 0, N_("Shear"), ""}, - {TFM_WARP, "WARP", 0, N_("Warp"), ""}, - {TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, N_("Shrinkfatten"), ""}, - {TFM_TILT, "TILT", 0, N_("Tilt"), ""}, - {TFM_TRACKBALL, "TRACKBALL", 0, N_("Trackball"), ""}, - {TFM_PUSHPULL, "PUSHPULL", 0, N_("Pushpull"), ""}, - {TFM_CREASE, "CREASE", 0, N_("Crease"), ""}, - {TFM_MIRROR, "MIRROR", 0, N_("Mirror"), ""}, - {TFM_BONESIZE, "BONE_SIZE", 0, N_("Bonesize"), ""}, - {TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, N_("Bone_Envelope"), ""}, - {TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, N_("Curve_Shrinkfatten"), ""}, - {TFM_BONE_ROLL, "BONE_ROLL", 0, N_("Bone_Roll"), ""}, - {TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, N_("Time_Translate"), ""}, - {TFM_TIME_SLIDE, "TIME_SLIDE", 0, N_("Time_Slide"), ""}, - {TFM_TIME_SCALE, "TIME_SCALE", 0, N_("Time_Scale"), ""}, - {TFM_TIME_EXTEND, "TIME_EXTEND", 0, N_("Time_Extend"), ""}, - {TFM_BAKE_TIME, "BAKE_TIME", 0, N_("Bake_Time"), ""}, - {TFM_BEVEL, "BEVEL", 0, N_("Bevel"), ""}, - {TFM_BWEIGHT, "BWEIGHT", 0, N_("Bweight"), ""}, - {TFM_ALIGN, "ALIGN", 0, N_("Align"), ""}, - {TFM_EDGE_SLIDE, "EDGESLIDE", 0, N_("Edge Slide"), ""}, - {TFM_SEQ_SLIDE, "SEQSLIDE", 0, N_("Sequence Slide"), ""}, + {TFM_INIT, "INIT", 0, "Init", ""}, + {TFM_DUMMY, "DUMMY", 0, "Dummy", ""}, + {TFM_TRANSLATION, "TRANSLATION", 0, "Translation", ""}, + {TFM_ROTATION, "ROTATION", 0, "Rotation", ""}, + {TFM_RESIZE, "RESIZE", 0, "Resize", ""}, + {TFM_TOSPHERE, "TOSPHERE", 0, "Tosphere", ""}, + {TFM_SHEAR, "SHEAR", 0, "Shear", ""}, + {TFM_WARP, "WARP", 0, "Warp", ""}, + {TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, "Shrinkfatten", ""}, + {TFM_TILT, "TILT", 0, "Tilt", ""}, + {TFM_TRACKBALL, "TRACKBALL", 0, "Trackball", ""}, + {TFM_PUSHPULL, "PUSHPULL", 0, "Pushpull", ""}, + {TFM_CREASE, "CREASE", 0, "Crease", ""}, + {TFM_MIRROR, "MIRROR", 0, "Mirror", ""}, + {TFM_BONESIZE, "BONE_SIZE", 0, "Bonesize", ""}, + {TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, "Bone_Envelope", ""}, + {TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve_Shrinkfatten", ""}, + {TFM_BONE_ROLL, "BONE_ROLL", 0, "Bone_Roll", ""}, + {TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, "Time_Translate", ""}, + {TFM_TIME_SLIDE, "TIME_SLIDE", 0, "Time_Slide", ""}, + {TFM_TIME_SCALE, "TIME_SCALE", 0, "Time_Scale", ""}, + {TFM_TIME_EXTEND, "TIME_EXTEND", 0, "Time_Extend", ""}, + {TFM_BAKE_TIME, "BAKE_TIME", 0, "Bake_Time", ""}, + {TFM_BEVEL, "BEVEL", 0, "Bevel", ""}, + {TFM_BWEIGHT, "BWEIGHT", 0, "Bweight", ""}, + {TFM_ALIGN, "ALIGN", 0, "Align", ""}, + {TFM_EDGE_SLIDE, "EDGESLIDE", 0, "Edge Slide", ""}, + {TFM_SEQ_SLIDE, "SEQSLIDE", 0, "Sequence Slide", ""}, {0, NULL, 0, NULL, NULL} }; @@ -159,8 +157,8 @@ static int snap_type_exec(bContext *C, wmOperator *op) static void TRANSFORM_OT_snap_type(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Snap Type"); - ot->description= _("Set the snap element type"); + ot->name= "Snap Type"; + ot->description= "Set the snap element type"; ot->idname= "TRANSFORM_OT_snap_type"; /* api callbacks */ @@ -173,7 +171,7 @@ static void TRANSFORM_OT_snap_type(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(snap_element_items), 0, _("Type"), _("Set the snap element type")); + ot->prop= RNA_def_enum(ot->srna, "type", snap_element_items, 0, "Type", "Set the snap element type"); } @@ -206,8 +204,8 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = _("Select Orientation"); - ot->description= _("Select transformation orientation"); + ot->name = "Select Orientation"; + ot->description= "Select transformation orientation"; ot->idname = "TRANSFORM_OT_select_orientation"; ot->flag = OPTYPE_UNDO; @@ -217,7 +215,7 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot) ot->poll = ED_operator_view3d_active; prop= RNA_def_property(ot->srna, "orientation", PROP_ENUM, PROP_NONE); - RNA_def_property_ui_text(prop, _("Orientation"), _("Transformation orientation")); + RNA_def_property_ui_text(prop, "Orientation", "Transformation orientation"); RNA_def_enum_funcs(prop, rna_TransformOrientation_itemf); } @@ -259,8 +257,8 @@ static int delete_orientation_poll(bContext *C) static void TRANSFORM_OT_delete_orientation(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Delete Orientation"); - ot->description= _("Delete transformation orientation"); + ot->name = "Delete Orientation"; + ot->description= "Delete transformation orientation"; ot->idname = "TRANSFORM_OT_delete_orientation"; ot->flag = OPTYPE_UNDO; @@ -294,8 +292,8 @@ static int create_orientation_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE static void TRANSFORM_OT_create_orientation(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Create Orientation"); - ot->description= _("Create transformation orientation from selection"); + ot->name = "Create Orientation"; + ot->description= "Create transformation orientation from selection"; ot->idname = "TRANSFORM_OT_create_orientation"; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; @@ -305,9 +303,9 @@ static void TRANSFORM_OT_create_orientation(struct wmOperatorType *ot) ot->poll = ED_operator_areaactive; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "name", "", 35, _("Name"), _("Text to insert at the cursor position.")); - RNA_def_boolean(ot->srna, "use", 0, _("Use after creation"), _("Select orientation after its creation")); - RNA_def_boolean(ot->srna, "overwrite", 0, _("Overwrite previous"), _("Overwrite previously created orientation with same name")); + RNA_def_string(ot->srna, "name", "", 35, "Name", "Text to insert at the cursor position."); + RNA_def_boolean(ot->srna, "use", 0, "Use after creation", "Select orientation after its creation"); + RNA_def_boolean(ot->srna, "overwrite", 0, "Overwrite previous", "Overwrite previously created orientation with same name"); } static void transformops_exit(bContext *C, wmOperator *op) @@ -455,15 +453,15 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) RNA_def_property_array(prop, 3); /* Make this not hidden when there's a nice axis selection widget */ RNA_def_property_flag(prop, PROP_HIDDEN); - RNA_def_property_ui_text(prop, _("Axis"), _("The axis around which the transformation occurs")); + RNA_def_property_ui_text(prop, "Axis", "The axis around which the transformation occurs"); } if (flags & P_CONSTRAINT) { - RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, _("Constraint Axis"), ""); + RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, "Constraint Axis", ""); prop= RNA_def_property(ot->srna, "constraint_orientation", PROP_ENUM, PROP_NONE); - RNA_def_property_ui_text(prop, _("Orientation"), _("Transformation orientation")); + RNA_def_property_ui_text(prop, "Orientation", "Transformation orientation"); RNA_def_enum_funcs(prop, rna_TransformOrientation_itemf); @@ -471,32 +469,32 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) if (flags & P_MIRROR) { - RNA_def_boolean(ot->srna, "mirror", 0, _("Mirror Editing"), ""); + RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", ""); } if (flags & P_PROPORTIONAL) { - RNA_def_enum(ot->srna, "proportional", proportional_editing_items, 0, _("Proportional Editing"), ""); - RNA_def_enum(ot->srna, "proportional_edit_falloff", proportional_falloff_items, 0, _("Proportional Editing Falloff"), _("Falloff type for proportional editing mode.")); - RNA_def_float(ot->srna, "proportional_size", 1, 0.00001f, FLT_MAX, _("Proportional Size"), "", 0.001, 100); + RNA_def_enum(ot->srna, "proportional", proportional_editing_items, 0, "Proportional Editing", ""); + RNA_def_enum(ot->srna, "proportional_edit_falloff", proportional_falloff_items, 0, "Proportional Editing Falloff", "Falloff type for proportional editing mode."); + RNA_def_float(ot->srna, "proportional_size", 1, 0.00001f, FLT_MAX, "Proportional Size", "", 0.001, 100); } if (flags & P_SNAP) { - prop= RNA_def_boolean(ot->srna, "snap", 0, _("Use Snapping Options"), ""); + prop= RNA_def_boolean(ot->srna, "snap", 0, "Use Snapping Options", ""); RNA_def_property_flag(prop, PROP_HIDDEN); if (flags & P_GEO_SNAP) { - prop= RNA_def_enum(ot->srna, "snap_target", snap_target_items, 0, _("Target"), ""); + prop= RNA_def_enum(ot->srna, "snap_target", snap_target_items, 0, "Target", ""); RNA_def_property_flag(prop, PROP_HIDDEN); - prop= RNA_def_float_vector(ot->srna, "snap_point", 3, NULL, -FLT_MAX, FLT_MAX, _("Point"), "", -FLT_MAX, FLT_MAX); + prop= RNA_def_float_vector(ot->srna, "snap_point", 3, NULL, -FLT_MAX, FLT_MAX, "Point", "", -FLT_MAX, FLT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN); if (flags & P_ALIGN_SNAP) { - prop= RNA_def_boolean(ot->srna, "snap_align", 0, _("Align with Point Normal"), ""); + prop= RNA_def_boolean(ot->srna, "snap_align", 0, "Align with Point Normal", ""); RNA_def_property_flag(prop, PROP_HIDDEN); - prop= RNA_def_float_vector(ot->srna, "snap_normal", 3, NULL, -FLT_MAX, FLT_MAX, _("Normal"), "", -FLT_MAX, FLT_MAX); + prop= RNA_def_float_vector(ot->srna, "snap_normal", 3, NULL, -FLT_MAX, FLT_MAX, "Normal", "", -FLT_MAX, FLT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN); } } @@ -504,7 +502,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) if (flags & P_OPTIONS) { - RNA_def_boolean(ot->srna, "texture_space", 0, _("Edit Object data texture space"), ""); + RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Object data texture space", ""); } if (flags & P_CORRECT_UV) @@ -513,15 +511,15 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) } // Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit - /*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, _("Confirm on Release"), _("Always confirm operation when releasing button")); + /*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button"); //RNA_def_property_flag(prop, PROP_HIDDEN); } void TRANSFORM_OT_translate(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Translate"); - ot->description= _("Translate selected items"); + ot->name = "Translate"; + ot->description= "Translate selected items"; ot->idname = OP_TRANSLATION; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -532,7 +530,7 @@ void TRANSFORM_OT_translate(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, _("Vector"), "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP|P_OPTIONS); } @@ -540,8 +538,8 @@ void TRANSFORM_OT_translate(struct wmOperatorType *ot) void TRANSFORM_OT_resize(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Resize"); - ot->description= _("Resize selected items"); + ot->name = "Resize"; + ot->description= "Resize selected items"; ot->idname = OP_RESIZE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -552,7 +550,7 @@ void TRANSFORM_OT_resize(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, _("Vector"), "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP|P_OPTIONS); } @@ -561,8 +559,8 @@ void TRANSFORM_OT_resize(struct wmOperatorType *ot) void TRANSFORM_OT_trackball(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Trackball"); - ot->description= _("Trackball style rotation of selected items"); + ot->name = "Trackball"; + ot->description= "Trackball style rotation of selected items"; ot->idname = OP_TRACKBALL; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -573,7 +571,7 @@ void TRANSFORM_OT_trackball(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, _("angle"), "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "angle", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -581,8 +579,8 @@ void TRANSFORM_OT_trackball(struct wmOperatorType *ot) void TRANSFORM_OT_rotate(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Rotate"); - ot->description= _("Rotate selected items"); + ot->name = "Rotate"; + ot->description= "Rotate selected items"; ot->idname = OP_ROTATION; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -593,7 +591,7 @@ void TRANSFORM_OT_rotate(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, _("Angle"), "", -M_PI*2, M_PI*2); + RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); Transform_Properties(ot, P_AXIS|P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP); } @@ -601,11 +599,11 @@ void TRANSFORM_OT_rotate(struct wmOperatorType *ot) void TRANSFORM_OT_tilt(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Tilt"); + ot->name = "Tilt"; /*optionals - "Tilt selected vertices." "Specify an extra axis rotation for selected vertices of 3d curve." */ - ot->description= _("Tilt selected control vertices of 3d curve"); + ot->description= "Tilt selected control vertices of 3d curve"; ot->idname = OP_TILT; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -616,7 +614,7 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editcurve; - RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, _("Angle"), "", -M_PI*2, M_PI*2); + RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -624,8 +622,8 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot) void TRANSFORM_OT_warp(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Warp"); - ot->description= _("Warp selected items around the cursor"); + ot->name = "Warp"; + ot->description= "Warp selected items around the cursor"; ot->idname = OP_WARP; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -636,7 +634,7 @@ void TRANSFORM_OT_warp(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, _("Angle"), "", 0, 1); + RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", 0, 1); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); // XXX Warp axis? @@ -645,8 +643,8 @@ void TRANSFORM_OT_warp(struct wmOperatorType *ot) void TRANSFORM_OT_shear(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Shear"); - ot->description= _("Shear selected items along the horizontal screen axis"); + ot->name = "Shear"; + ot->description= "Shear selected items along the horizontal screen axis"; ot->idname = OP_SHEAR; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -657,7 +655,7 @@ void TRANSFORM_OT_shear(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, _("Offset"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); // XXX Shear axis? @@ -666,8 +664,8 @@ void TRANSFORM_OT_shear(struct wmOperatorType *ot) void TRANSFORM_OT_push_pull(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Push/Pull"); - ot->description= _("Push/Pull selected items"); + ot->name = "Push/Pull"; + ot->description= "Push/Pull selected items"; ot->idname = OP_PUSH_PULL; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -678,7 +676,7 @@ void TRANSFORM_OT_push_pull(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, _("Distance"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Distance", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -686,8 +684,8 @@ void TRANSFORM_OT_push_pull(struct wmOperatorType *ot) void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Shrink/Fatten"); - ot->description= _("Shrink/fatten selected vertices along normals"); + ot->name = "Shrink/Fatten"; + ot->description= "Shrink/fatten selected vertices along normals"; ot->idname = OP_SHRINK_FATTEN; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -698,7 +696,7 @@ void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; - RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, _("Offset"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -706,9 +704,9 @@ void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("To Sphere"); + ot->name = "To Sphere"; //added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()" - ot->description= _("Move selected vertices outward in a spherical shape around mesh center"); + ot->description= "Move selected vertices outward in a spherical shape around mesh center"; ot->idname = OP_TOSPHERE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -719,7 +717,7 @@ void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_factor(ot->srna, "value", 0, 0, 1, _("Factor"), "", 0, 1); + RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -727,8 +725,8 @@ void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) void TRANSFORM_OT_mirror(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Mirror"); - ot->description= _("Mirror selected vertices around one or more axes"); + ot->name = "Mirror"; + ot->description= "Mirror selected vertices around one or more axes"; ot->idname = OP_MIRROR; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -745,8 +743,8 @@ void TRANSFORM_OT_mirror(struct wmOperatorType *ot) void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Edge Slide"); - ot->description= _("Slide an edge loop along a mesh"); + ot->name = "Edge Slide"; + ot->description= "Slide an edge loop along a mesh"; ot->idname = OP_EDGE_SLIDE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -757,7 +755,7 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; - RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, _("Factor"), "", -1.0f, 1.0f); + RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); Transform_Properties(ot, P_MIRROR|P_SNAP|P_CORRECT_UV); } @@ -765,8 +763,8 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Edge Crease"); - ot->description= _("Change the crease of edges"); + ot->name = "Edge Crease"; + ot->description= "Change the crease of edges"; ot->idname = OP_EDGE_CREASE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -777,7 +775,7 @@ void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; - RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, _("Factor"), "", -1.0f, 1.0f); + RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); Transform_Properties(ot, P_SNAP); } @@ -785,8 +783,8 @@ void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot) void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot) { /* identifiers */ - ot->name = _("Sequence Slide"); - ot->description= _("Slide a sequence strip in time"); + ot->name = "Sequence Slide"; + ot->description= "Slide a sequence strip in time"; ot->idname = OP_SEQ_SLIDE; ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -797,7 +795,7 @@ void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_sequencer_active; - RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, _("angle"), "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "angle", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_SNAP); } @@ -807,8 +805,8 @@ void TRANSFORM_OT_transform(struct wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = _("Transform"); - ot->description= _("Transform selected items by mode type"); + ot->name = "Transform"; + ot->description= "Transform selected items by mode type"; ot->idname = "TRANSFORM_OT_transform"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; @@ -819,10 +817,10 @@ void TRANSFORM_OT_transform(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); + prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); RNA_def_property_flag(prop, PROP_HIDDEN); - RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, _("Values"), "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_AXIS|P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP); } diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index e284540c5a6..72f13c14f5d 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index fffd2670814..cfbc735eb5c 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' incs += ' ../../blenloader' diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 21420d88899..c1aca61f795 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -46,8 +46,6 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_blender.h" #include "BKE_context.h" #include "BKE_global.h" @@ -296,8 +294,8 @@ static int ed_redo_exec(bContext *C, wmOperator *UNUSED(op)) void ED_OT_undo(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Undo"); - ot->description= _("Undo previous action"); + ot->name= "Undo"; + ot->description= "Undo previous action"; ot->idname= "ED_OT_undo"; /* api callbacks */ @@ -323,8 +321,8 @@ void ED_OT_undo_push(wmOperatorType *ot) void ED_OT_redo(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Redo"); - ot->description= _("Redo previous action"); + ot->name= "Redo"; + ot->description= "Redo previous action"; ot->idname= "ED_OT_redo"; /* api callbacks */ @@ -521,8 +519,8 @@ static int undo_history_exec(bContext *C, wmOperator *op) void ED_OT_undo_history(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Undo History"); - ot->description= _("Redo specific action in history"); + ot->name= "Undo History"; + ot->description= "Redo specific action in history"; ot->idname= "ED_OT_undo_history"; /* api callbacks */ @@ -530,7 +528,7 @@ void ED_OT_undo_history(wmOperatorType *ot) ot->exec= undo_history_exec; ot->poll= ED_operator_screenactive; - RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, _("Item"), "", 0, INT_MAX); + RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, "Item", "", 0, INT_MAX); } diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 4055585af74..552e1b60154 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -21,7 +21,6 @@ set(INC ../include - ../../blenfont ../../blenkernel ../../blenlib ../../blenloader diff --git a/source/blender/editors/uvedit/SConscript b/source/blender/editors/uvedit/SConscript index 695aa217b5e..2523de005d0 100644 --- a/source/blender/editors/uvedit/SConscript +++ b/source/blender/editors/uvedit/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna #/intern/opennl/extern ../../gpu ../../blenloader' diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 1e3cfbede9c..05159414975 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -47,8 +47,6 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_depsgraph.h" @@ -1204,17 +1202,17 @@ static int align_exec(bContext *C, wmOperator *op) static void UV_OT_align(wmOperatorType *ot) { static EnumPropertyItem axis_items[] = { - {'s', "ALIGN_S", 0, N_("Straighten"), N_("Align UVs along the line defined by the endpoints")}, - {'t', "ALIGN_T", 0, N_("Straighten X"), N_("Align UVs along the line defined by the endpoints along the X axis")}, - {'u', "ALIGN_U", 0, N_("Straighten Y"), N_("Align UVs along the line defined by the endpoints along the Y axis")}, - {'a', "ALIGN_AUTO", 0, N_("Align Auto"), N_("Automatically choose the axis on which there is most alignment already")}, - {'x', "ALIGN_X", 0, N_("Align X"), N_("Align UVs on X axis")}, - {'y', "ALIGN_Y", 0, N_("Align Y"), N_("Align UVs on Y axis")}, + {'s', "ALIGN_S", 0, "Straighten", "Align UVs along the line defined by the endpoints"}, + {'t', "ALIGN_T", 0, "Straighten X", "Align UVs along the line defined by the endpoints along the X axis"}, + {'u', "ALIGN_U", 0, "Straighten Y", "Align UVs along the line defined by the endpoints along the Y axis"}, + {'a', "ALIGN_AUTO", 0, "Align Auto", "Automatically choose the axis on which there is most alignment already"}, + {'x', "ALIGN_X", 0, "Align X", "Align UVs on X axis"}, + {'y', "ALIGN_Y", 0, "Align Y", "Align UVs on Y axis"}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Align"); - ot->description= _("Align selected UV vertices to an axis"); + ot->name= "Align"; + ot->description= "Align selected UV vertices to an axis"; ot->idname= "UV_OT_align"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1223,7 +1221,7 @@ static void UV_OT_align(wmOperatorType *ot) ot->poll= ED_operator_image_active; /* requires space image */; /* properties */ - RNA_def_enum(ot->srna, "axis", RNA_enum_items_gettexted(axis_items), 'a', _("Axis"), _("Axis to align UV locations on.")); + RNA_def_enum(ot->srna, "axis", axis_items, 'a', "Axis", "Axis to align UV locations on."); } /* ******************** weld operator **************** */ @@ -1238,8 +1236,8 @@ static int weld_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_weld(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Weld"); - ot->description= _("Weld selected UV vertices together"); + ot->name= "Weld"; + ot->description= "Weld selected UV vertices together"; ot->idname= "UV_OT_weld"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1425,8 +1423,8 @@ static int stitch_exec(bContext *C, wmOperator *op) static void UV_OT_stitch(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Stitch"); - ot->description= _("Stitch selected UV vertices by proximity"); + ot->name= "Stitch"; + ot->description= "Stitch selected UV vertices by proximity"; ot->idname= "UV_OT_stitch"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1435,8 +1433,8 @@ static void UV_OT_stitch(wmOperatorType *ot) ot->poll= ED_operator_uvedit; /* properties */ - RNA_def_boolean(ot->srna, "use_limit", 1, _("Use Limit"), _("Stitch UVs within a specified limit distance.")); - RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, FLT_MAX, _("Limit"), _("Limit distance in normalized coordinates."), -FLT_MAX, FLT_MAX); + RNA_def_boolean(ot->srna, "use_limit", 1, "Use Limit", "Stitch UVs within a specified limit distance."); + RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, FLT_MAX, "Limit", "Limit distance in normalized coordinates.", -FLT_MAX, FLT_MAX); } /* ******************** (de)select all operator **************** */ @@ -1521,8 +1519,8 @@ static int select_all_exec(bContext *C, wmOperator *op) static void UV_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select or Deselect All"); - ot->description= _("Change selection of all UV vertices"); + ot->name= "Select or Deselect All"; + ot->description= "Change selection of all UV vertices"; ot->idname= "UV_OT_select_all"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1858,8 +1856,8 @@ static int select_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select"); - ot->description= _("Select UV vertices"); + ot->name= "Select"; + ot->description= "Select UV vertices"; ot->idname= "UV_OT_select"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1870,9 +1868,9 @@ static void UV_OT_select(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", 0, - _("Extend"), _("Extend selection rather than clearing the existing selection.")); + "Extend", "Extend selection rather than clearing the existing selection."); RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, - _("Location"), _("Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds."), -100.0f, 100.0f); + "Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds.", -100.0f, 100.0f); } /* ******************** loop select operator **************** */ @@ -1903,8 +1901,8 @@ static int select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_select_loop(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Loop Select"); - ot->description= _("Select a loop of connected UV vertices"); + ot->name= "Loop Select"; + ot->description= "Select a loop of connected UV vertices"; ot->idname= "UV_OT_select_loop"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1915,9 +1913,9 @@ static void UV_OT_select_loop(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", 0, - _("Extend"), _("Extend selection rather than clearing the existing selection.")); + "Extend", "Extend selection rather than clearing the existing selection."); RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, - _("Location"), _("Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds."), -100.0f, 100.0f); + "Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds.", -100.0f, 100.0f); } /* ******************** linked select operator **************** */ @@ -1980,8 +1978,8 @@ static int select_linked_exec(bContext *C, wmOperator *op) static void UV_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked"); - ot->description= _("Select all UV vertices linked to the active UV map"); + ot->name= "Select Linked"; + ot->description= "Select all UV vertices linked to the active UV map"; ot->idname= "UV_OT_select_linked"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1991,7 +1989,7 @@ static void UV_OT_select_linked(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", 0, - _("Extend"), _("Extend selection rather than clearing the existing selection.")); + "Extend", "Extend selection rather than clearing the existing selection."); } static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event) @@ -2007,8 +2005,8 @@ static int select_linked_pick_exec(bContext *C, wmOperator *op) static void UV_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Select Linked Pick"); - ot->description= _("Select all UV vertices linked under the mouse"); + ot->name= "Select Linked Pick"; + ot->description= "Select all UV vertices linked under the mouse"; ot->idname= "UV_OT_select_linked_pick"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2019,10 +2017,10 @@ static void UV_OT_select_linked_pick(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", 0, - _("Extend"), _("Extend selection rather than clearing the existing selection.")); + "Extend", "Extend selection rather than clearing the existing selection."); RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, - _("Location"), _("Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds."), -100.0f, 100.0f); + "Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds.", -100.0f, 100.0f); } /* ******************** unlink selection operator **************** */ @@ -2064,8 +2062,8 @@ static int unlink_selection_exec(bContext *C, wmOperator *op) static void UV_OT_unlink_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Unlink Selection"); - ot->description= _("Unlink selected UV vertices from active UV map"); + ot->name= "Unlink Selection"; + ot->description= "Unlink selected UV vertices from active UV map"; ot->idname= "UV_OT_unlink_selected"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2345,8 +2343,8 @@ static int border_select_exec(bContext *C, wmOperator *op) static void UV_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Border Select"); - ot->description= _("Select UV vertices using border selection"); + ot->name= "Border Select"; + ot->description= "Select UV vertices using border selection"; ot->idname= "UV_OT_select_border"; /* api callbacks */ @@ -2360,7 +2358,7 @@ static void UV_OT_select_border(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "pinned", 0, _("Pinned"), _("Border select pinned UVs only.")); + RNA_def_boolean(ot->srna, "pinned", 0, "Pinned", "Border select pinned UVs only."); WM_operator_properties_gesture_border(ot, FALSE); } @@ -2435,8 +2433,8 @@ static int circle_select_exec(bContext *C, wmOperator *op) static void UV_OT_circle_select(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Circle Select"); - ot->description= _("Select UV vertices using circle selection"); + ot->name= "Circle Select"; + ot->description= "Select UV vertices using circle selection"; ot->idname= "UV_OT_circle_select"; /* api callbacks */ @@ -2452,8 +2450,8 @@ static void UV_OT_circle_select(wmOperatorType *ot) /* properties */ RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, _("Radius"), "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, _("Gesture Mode"), "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, "Radius", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX); } /* ******************** snap cursor operator **************** */ @@ -2506,13 +2504,13 @@ static int snap_cursor_exec(bContext *C, wmOperator *op) static void UV_OT_snap_cursor(wmOperatorType *ot) { static EnumPropertyItem target_items[] = { - {0, "PIXELS", 0, N_("Pixels"), ""}, - {1, "SELECTED", 0, N_("Selected"), ""}, + {0, "PIXELS", 0, "Pixels", ""}, + {1, "SELECTED", 0, "Selected", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Snap Cursor"); - ot->description= _("Snap cursor to target type"); + ot->name= "Snap Cursor"; + ot->description= "Snap cursor to target type"; ot->idname= "UV_OT_snap_cursor"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2521,7 +2519,7 @@ static void UV_OT_snap_cursor(wmOperatorType *ot) ot->poll= ED_operator_image_active; /* requires space image */; /* properties */ - RNA_def_enum(ot->srna, "target", target_items, 0, _("Target"), _("Target to snap the selected UV's to.")); + RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UV's to."); } /* ******************** snap selection operator **************** */ @@ -2747,14 +2745,14 @@ static int snap_selection_exec(bContext *C, wmOperator *op) static void UV_OT_snap_selected(wmOperatorType *ot) { static EnumPropertyItem target_items[] = { - {0, "PIXELS", 0, N_("Pixels"), ""}, - {1, "CURSOR", 0, N_("Cursor"), ""}, - {2, "ADJACENT_UNSELECTED", 0, N_("Adjacent Unselected"), ""}, + {0, "PIXELS", 0, "Pixels", ""}, + {1, "CURSOR", 0, "Cursor", ""}, + {2, "ADJACENT_UNSELECTED", 0, "Adjacent Unselected", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Snap Selection"); - ot->description= _("Snap selected UV vertices to target type"); + ot->name= "Snap Selection"; + ot->description= "Snap selected UV vertices to target type"; ot->idname= "UV_OT_snap_selected"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2763,7 +2761,7 @@ static void UV_OT_snap_selected(wmOperatorType *ot) ot->poll= ED_operator_image_active; /* requires space image */; /* properties */ - RNA_def_enum(ot->srna, "target", RNA_enum_items_gettexted(target_items), 0, _("Target"), _("Target to snap the selected UV's to.")); + RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UV's to."); } /* ******************** pin operator **************** */ @@ -2808,8 +2806,8 @@ static int pin_exec(bContext *C, wmOperator *op) static void UV_OT_pin(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Pin"); - ot->description= _("Set/clear selected UV vertices as anchored between multiple unwrap operations"); + ot->name= "Pin"; + ot->description= "Set/clear selected UV vertices as anchored between multiple unwrap operations"; ot->idname= "UV_OT_pin"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2818,7 +2816,7 @@ static void UV_OT_pin(wmOperatorType *ot) ot->poll= ED_operator_uvedit; /* properties */ - RNA_def_boolean(ot->srna, "clear", 0, _("Clear"), _("Clear pinning for the selection instead of setting it.")); + RNA_def_boolean(ot->srna, "clear", 0, "Clear", "Clear pinning for the selection instead of setting it."); } /******************* select pinned operator ***************/ @@ -2854,8 +2852,8 @@ static int select_pinned_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_select_pinned(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Selected Pinned"); - ot->description= _("Select all pinned UV vertices"); + ot->name= "Selected Pinned"; + ot->description= "Select all pinned UV vertices"; ot->idname= "UV_OT_select_pinned"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -2993,8 +2991,8 @@ static int hide_exec(bContext *C, wmOperator *op) static void UV_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Hide Selected"); - ot->description= _("Hide (un)selected UV vertices"); + ot->name= "Hide Selected"; + ot->description= "Hide (un)selected UV vertices"; ot->idname= "UV_OT_hide"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -3003,7 +3001,7 @@ static void UV_OT_hide(wmOperatorType *ot) ot->poll= ED_operator_uvedit; /* props */ - RNA_def_boolean(ot->srna, "unselected", 0, _("Unselected"), _("Hide unselected rather than selected.")); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } /****************** reveal operator ******************/ @@ -3127,8 +3125,8 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) static void UV_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reveal Hidden"); - ot->description= _("Reveal all hidden UV vertices"); + ot->name= "Reveal Hidden"; + ot->description= "Reveal all hidden UV vertices"; ot->idname= "UV_OT_reveal"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -3170,8 +3168,8 @@ static int set_2d_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set 2D Cursor"); - ot->description= _("Set 2D cursor location"); + ot->name= "Set 2D Cursor"; + ot->description= "Set 2D cursor location"; ot->idname= "UV_OT_cursor_set"; /* api callbacks */ @@ -3183,7 +3181,7 @@ static void UV_OT_cursor_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Cursor location in 0.0-1.0 coordinates."), -10.0f, 10.0f); + RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in 0.0-1.0 coordinates.", -10.0f, 10.0f); } /********************** set tile operator **********************/ @@ -3236,8 +3234,8 @@ static int set_tile_invoke(bContext *C, wmOperator *op, wmEvent *event) static void UV_OT_tile_set(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Set Tile"); - ot->description= _("Set UV image tile coordinates"); + ot->name= "Set Tile"; + ot->description= "Set UV image tile coordinates"; ot->idname= "UV_OT_tile_set"; /* api callbacks */ @@ -3249,7 +3247,7 @@ static void UV_OT_tile_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int_vector(ot->srna, "tile", 2, NULL, 0, INT_MAX, _("Tile"), _("Tile coordinate."), 0, 10); + RNA_def_int_vector(ot->srna, "tile", 2, NULL, 0, INT_MAX, "Tile", "Tile coordinate.", 0, 10); } /* ************************** registration **********************************/ diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index a2418dc1314..e8a7896abd5 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -49,8 +49,6 @@ #include "BLI_uvproject.h" #include "BLI_utildefines.h" -#include "BLF_api.h" - #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_depsgraph.h" @@ -463,10 +461,10 @@ static int minimize_stretch_cancel(bContext *C, wmOperator *op) void UV_OT_minimize_stretch(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Minimize Stretch"); + ot->name= "Minimize Stretch"; ot->idname= "UV_OT_minimize_stretch"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->description=_("Reduce UV stretching by relaxing angles"); + ot->description="Reduce UV stretching by relaxing angles"; /* api callbacks */ ot->exec= minimize_stretch_exec; @@ -476,9 +474,9 @@ void UV_OT_minimize_stretch(wmOperatorType *ot) ot->poll= ED_operator_uvedit; /* properties */ - RNA_def_boolean(ot->srna, "fill_holes", 1, _("Fill Holes"), _("Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry.")); - RNA_def_float_factor(ot->srna, "blend", 0.0f, 0.0f, 1.0f, _("Blend"), _("Blend factor between stretch minimized and original."), 0.0f, 1.0f); - RNA_def_int(ot->srna, "iterations", 0, 0, INT_MAX, _("Iterations"), _("Number of iterations to run, 0 is unlimited when run interactively."), 0, 100); + RNA_def_boolean(ot->srna, "fill_holes", 1, "Fill Holes", "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry."); + RNA_def_float_factor(ot->srna, "blend", 0.0f, 0.0f, 1.0f, "Blend", "Blend factor between stretch minimized and original.", 0.0f, 1.0f); + RNA_def_int(ot->srna, "iterations", 0, 0, INT_MAX, "Iterations", "Number of iterations to run, 0 is unlimited when run interactively.", 0, 100); } /* ******************** Pack Islands operator **************** */ @@ -518,7 +516,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op) void UV_OT_pack_islands(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Pack Islands"); + ot->name= "Pack Islands"; ot->idname= "UV_OT_pack_islands"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -527,7 +525,7 @@ void UV_OT_pack_islands(wmOperatorType *ot) ot->poll= ED_operator_uvedit; /* properties */ - RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, _("Margin"), _("Space between islands"), 0.0f, 1.0f); + RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, "Margin", "Space between islands", 0.0f, 1.0f); } /* ******************** Average Islands Scale operator **************** */ @@ -560,7 +558,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op)) void UV_OT_average_islands_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Average Islands Scale"); + ot->name= "Average Islands Scale"; ot->idname= "UV_OT_average_islands_scale"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -743,21 +741,21 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float static void uv_transform_properties(wmOperatorType *ot, int radius) { static EnumPropertyItem direction_items[]= { - {VIEW_ON_EQUATOR, "VIEW_ON_EQUATOR", 0, N_("View on Equator"), N_("3D view is on the equator")}, - {VIEW_ON_POLES, "VIEW_ON_POLES", 0, N_("View on Poles"), N_("3D view is on the poles")}, - {ALIGN_TO_OBJECT, "ALIGN_TO_OBJECT", 0, N_("Align to Object"), N_("Align according to object transform")}, + {VIEW_ON_EQUATOR, "VIEW_ON_EQUATOR", 0, "View on Equator", "3D view is on the equator"}, + {VIEW_ON_POLES, "VIEW_ON_POLES", 0, "View on Poles", "3D view is on the poles"}, + {ALIGN_TO_OBJECT, "ALIGN_TO_OBJECT", 0, "Align to Object", "Align according to object transform"}, {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem align_items[]= { - {POLAR_ZX, "POLAR_ZX", 0, N_("Polar ZX"), N_("Polar 0 is X")}, - {POLAR_ZY, "POLAR_ZY", 0, N_("Polar ZY"), N_("Polar 0 is Y")}, + {POLAR_ZX, "POLAR_ZX", 0, "Polar ZX", "Polar 0 is X"}, + {POLAR_ZY, "POLAR_ZY", 0, "Polar ZY", "Polar 0 is Y"}, {0, NULL, 0, NULL, NULL} }; - RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(direction_items), VIEW_ON_EQUATOR, _("Direction"), _("Direction of the sphere or cylinder.")); - RNA_def_enum(ot->srna, "align", RNA_enum_items_gettexted(align_items), VIEW_ON_EQUATOR, _("Align"), _("How to determine rotation around the pole.")); + RNA_def_enum(ot->srna, "direction", direction_items, VIEW_ON_EQUATOR, "Direction", "Direction of the sphere or cylinder."); + RNA_def_enum(ot->srna, "align", align_items, VIEW_ON_EQUATOR, "Align", "How to determine rotation around the pole."); if(radius) - RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, _("Radius"), _("Radius of the sphere or cylinder."), 0.0001f, 100.0f); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, "Radius", "Radius of the sphere or cylinder.", 0.0001f, 100.0f); } static void correct_uv_aspect(EditMesh *em) @@ -810,9 +808,9 @@ static void correct_uv_aspect(EditMesh *em) static void uv_map_clip_correct_properties(wmOperatorType *ot) { - RNA_def_boolean(ot->srna, "correct_aspect", 1, _("Correct Aspect"), _("Map UV's taking image aspect ratio into account.")); - RNA_def_boolean(ot->srna, "clip_to_bounds", 0, _("Clip to Bounds"), _("Clip UV coordinates to bounds after unwrapping.")); - RNA_def_boolean(ot->srna, "scale_to_bounds", 0, _("Scale to Bounds"), _("Scale UV coordinates to bounds after unwrapping.")); + RNA_def_boolean(ot->srna, "correct_aspect", 1, "Correct Aspect", "Map UV's taking image aspect ratio into account."); + RNA_def_boolean(ot->srna, "clip_to_bounds", 0, "Clip to Bounds", "Clip UV coordinates to bounds after unwrapping."); + RNA_def_boolean(ot->srna, "scale_to_bounds", 0, "Scale to Bounds", "Scale UV coordinates to bounds after unwrapping."); } static void uv_map_clip_correct(EditMesh *em, wmOperator *op) @@ -954,13 +952,13 @@ static int unwrap_exec(bContext *C, wmOperator *op) void UV_OT_unwrap(wmOperatorType *ot) { static EnumPropertyItem method_items[] = { - {0, "ANGLE_BASED", 0, N_("Angle Based"), ""}, - {1, "CONFORMAL", 0, N_("Conformal"), ""}, + {0, "ANGLE_BASED", 0, "Angle Based", ""}, + {1, "CONFORMAL", 0, "Conformal", ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= _("Unwrap"); - ot->description= _("Unwrap the mesh of the object being edited"); + ot->name= "Unwrap"; + ot->description= "Unwrap the mesh of the object being edited"; ot->idname= "UV_OT_unwrap"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -969,9 +967,9 @@ void UV_OT_unwrap(wmOperatorType *ot) ot->poll= ED_operator_uvmap; /* properties */ - RNA_def_enum(ot->srna, "method", RNA_enum_items_gettexted(method_items), 0, _("Method"), _("Unwrapping method. Angle Based usually gives better results than Conformal, while being somewhat slower.")); - RNA_def_boolean(ot->srna, "fill_holes", 1, _("Fill Holes"), _("Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry.")); - RNA_def_boolean(ot->srna, "correct_aspect", 1, _("Correct Aspect"), _("Map UV's taking image aspect ratio into account.")); + RNA_def_enum(ot->srna, "method", method_items, 0, "Method", "Unwrapping method. Angle Based usually gives better results than Conformal, while being somewhat slower."); + RNA_def_boolean(ot->srna, "fill_holes", 1, "Fill Holes", "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry."); + RNA_def_boolean(ot->srna, "correct_aspect", 1, "Correct Aspect", "Map UV's taking image aspect ratio into account."); } /**************** Project From View operator **************/ @@ -1071,7 +1069,7 @@ static int uv_from_view_poll(bContext *C) void UV_OT_from_view(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Project From View"); + ot->name= "Project From View"; ot->idname= "UV_OT_project_from_view"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1080,7 +1078,7 @@ void UV_OT_from_view(wmOperatorType *ot) ot->poll= uv_from_view_poll; /* properties */ - RNA_def_boolean(ot->srna, "orthographic", 0, _("Orthographic"), _("Use orthographic projection.")); + RNA_def_boolean(ot->srna, "orthographic", 0, "Orthographic", "Use orthographic projection."); uv_map_clip_correct_properties(ot); } @@ -1128,7 +1126,7 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op)) void UV_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Reset"); + ot->name= "Reset"; ot->idname= "UV_OT_reset"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1216,7 +1214,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op) void UV_OT_sphere_project(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Sphere Projection"); + ot->name= "Sphere Projection"; ot->idname= "UV_OT_sphere_project"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1288,7 +1286,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op) void UV_OT_cylinder_project(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cylinder Projection"); + ot->name= "Cylinder Projection"; ot->idname= "UV_OT_cylinder_project"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1375,7 +1373,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) void UV_OT_cube_project(wmOperatorType *ot) { /* identifiers */ - ot->name= _("Cube Projection"); + ot->name= "Cube Projection"; ot->idname= "UV_OT_cube_project"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1384,6 +1382,6 @@ void UV_OT_cube_project(wmOperatorType *ot) ot->poll= ED_operator_uvmap; /* properties */ - RNA_def_float(ot->srna, "cube_size", 1.0f, 0.0f, FLT_MAX, _("Cube Size"), _("Size of the cube to project on."), 0.001f, 100.0f); + RNA_def_float(ot->srna, "cube_size", 1.0f, 0.0f, FLT_MAX, "Cube Size", "Size of the cube to project on.", 0.001f, 100.0f); uv_map_clip_correct_properties(ot); } diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h old mode 100755 new mode 100644 diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c old mode 100755 new mode 100644 diff --git a/source/blender/imbuf/intern/indexer_dv.c b/source/blender/imbuf/intern/indexer_dv.c old mode 100755 new mode 100644 diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d3ac09dc812..05b16f869a8 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -510,8 +510,8 @@ extern UserDef U; /* from blenkernel blender.c */ /* transopts */ #define USER_TR_TOOLTIPS (1 << 0) -#define USER_TR_BUTTONS (1 << 1) -#define USER_TR_MENUS (1 << 2) +#define USER_TR_IFACE (1 << 1) +/*#define USER_TR_MENUS (1 << 2) deprecated*/ /*#define USER_TR_FILESELECT (1 << 3) deprecated*/ /*#define USER_TR_TEXTEDIT (1 << 4) deprecated*/ #define USER_DOTRANSLATE (1 << 5) diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 38f5e9af466..4cc8a1f5f2f 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -702,6 +702,7 @@ int RNA_enum_name(EnumPropertyItem *item, const int value, const char **name); int RNA_enum_description(EnumPropertyItem *item, const int value, const char **description); void RNA_property_enum_items(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, EnumPropertyItem **item, int *totitem, int *free); +void RNA_property_enum_items_gettexted(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, EnumPropertyItem **item, int *totitem, int *free); int RNA_property_enum_value(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *value); int RNA_property_enum_identifier(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier); int RNA_property_enum_name(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **name); diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 10b20fc795a..d0002eda30b 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -62,4 +62,7 @@ if env['OURPLATFORM'] == 'linux': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['WITH_BF_INTERNATIONAL']: + defs.append('INTERNATIONAL') + env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] ) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index c2b46a3b69a..966bc8f100c 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -219,6 +219,10 @@ if(WITH_OPENCOLLADA) add_definitions(-DWITH_COLLADA) endif() +if(WITH_INTERNATIONAL) + add_definitions(-DINTERNATIONAL) +endif() + # Build makesrna executable blender_include_dirs( . diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 5c2580e4b90..ef05875fe86 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -98,6 +98,9 @@ if env['OURPLATFORM'] == 'linux': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['WITH_BF_INTERNATIONAL']: + defs.append('INTERNATIONAL') + makesrna_tool.Append(CPPDEFINES=defs) makesrna_tool.Append (CPPPATH = Split(incs)) diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 63f5b8f8211..05786cedeac 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -33,8 +33,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "BLF_api.h" - #include "DNA_ID.h" #include "DNA_vfont_types.h" #include "DNA_material_types.h" @@ -48,33 +46,33 @@ * NOTE: need to keep this in line with the other defines for these */ EnumPropertyItem id_type_items[] = { - {ID_AC, "ACTION", ICON_ACTION, N_("Action"), ""}, - {ID_AR, "ARMATURE", ICON_ARMATURE_DATA, N_("Armature"), ""}, - {ID_BR, "BRUSH", ICON_BRUSH_DATA, N_("Brush"), ""}, - {ID_CA, "CAMERA", ICON_CAMERA_DATA, N_("Camera"), ""}, - {ID_CU, "CURVE", ICON_CURVE_DATA, N_("Curve"), ""}, - {ID_VF, "FONT", ICON_FONT_DATA, N_("Font"), ""}, - {ID_GD, "GREASEPENCIL", ICON_GREASEPENCIL, N_("Grease Pencil"), ""}, - {ID_GR, "GROUP", ICON_GROUP, N_("Group"), ""}, - {ID_IM, "IMAGE", ICON_IMAGE_DATA, N_("Image"), ""}, - {ID_KE, "KEY", ICON_SHAPEKEY_DATA, N_("Key"), ""}, - {ID_LA, "LAMP", ICON_LAMP_DATA, N_("Lamp"), ""}, - {ID_LI, "LIBRARY", ICON_LIBRARY_DATA_DIRECT, N_("Library"), ""}, - {ID_LT, "LATTICE", ICON_LATTICE_DATA, N_("Lattice"), ""}, - {ID_MA, "MATERIAL", ICON_MATERIAL_DATA, N_("Material"), ""}, - {ID_MB, "META", ICON_META_DATA, N_("MetaBall"), ""}, - {ID_ME, "MESH", ICON_MESH_DATA, N_("Mesh"), ""}, - {ID_NT, "NODETREE", ICON_NODETREE, N_("NodeTree"), ""}, - {ID_OB, "OBJECT", ICON_OBJECT_DATA, N_("Object"), ""}, - {ID_PA, "PARTICLE", ICON_PARTICLE_DATA, N_("Particle"), ""}, - {ID_SCE, "SCENE", ICON_SCENE_DATA, N_("Scene"), ""}, - {ID_SCR, "SCREEN", ICON_SPLITSCREEN, N_("Screen"), ""}, - {ID_SPK, "SPEAKER", ICON_SPEAKER, N_("Speaker"), ""}, - {ID_SO, "SOUND", ICON_PLAY_AUDIO, N_("Sound"), ""}, - {ID_TXT, "TEXT", ICON_TEXT, N_("Text"), ""}, - {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, N_("Texture"), ""}, - {ID_WO, "WORLD", ICON_WORLD_DATA, N_("World"), ""}, - {ID_WM, "WINDOWMANAGER", ICON_FULLSCREEN, N_("Window Manager"), ""}, + {ID_AC, "ACTION", ICON_ACTION, "Action", ""}, + {ID_AR, "ARMATURE", ICON_ARMATURE_DATA, "Armature", ""}, + {ID_BR, "BRUSH", ICON_BRUSH_DATA, "Brush", ""}, + {ID_CA, "CAMERA", ICON_CAMERA_DATA, "Camera", ""}, + {ID_CU, "CURVE", ICON_CURVE_DATA, "Curve", ""}, + {ID_VF, "FONT", ICON_FONT_DATA, "Font", ""}, + {ID_GD, "GREASEPENCIL", ICON_GREASEPENCIL, "Grease Pencil", ""}, + {ID_GR, "GROUP", ICON_GROUP, "Group", ""}, + {ID_IM, "IMAGE", ICON_IMAGE_DATA, "Image", ""}, + {ID_KE, "KEY", ICON_SHAPEKEY_DATA, "Key", ""}, + {ID_LA, "LAMP", ICON_LAMP_DATA, "Lamp", ""}, + {ID_LI, "LIBRARY", ICON_LIBRARY_DATA_DIRECT, "Library", ""}, + {ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""}, + {ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""}, + {ID_MB, "META", ICON_META_DATA, "MetaBall", ""}, + {ID_ME, "MESH", ICON_MESH_DATA, "Mesh", ""}, + {ID_NT, "NODETREE", ICON_NODETREE, "NodeTree", ""}, + {ID_OB, "OBJECT", ICON_OBJECT_DATA, "Object", ""}, + {ID_PA, "PARTICLE", ICON_PARTICLE_DATA, "Particle", ""}, + {ID_SCE, "SCENE", ICON_SCENE_DATA, "Scene", ""}, + {ID_SCR, "SCREEN", ICON_SPLITSCREEN, "Screen", ""}, + {ID_SPK, "SPEAKER", ICON_SPEAKER, "Speaker", ""}, + {ID_SO, "SOUND", ICON_PLAY_AUDIO, "Sound", ""}, + {ID_TXT, "TEXT", ICON_TEXT, "Text", ""}, + {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""}, + {ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""}, + {ID_WM, "WINDOWMANAGER", ICON_FULLSCREEN, "Window Manager", ""}, {0, NULL, 0, NULL, NULL}}; #ifdef RNA_RUNTIME @@ -436,19 +434,19 @@ static void rna_def_ID(BlenderRNA *brna) PropertyRNA *prop, *parm; static EnumPropertyItem update_flag_items[] = { - {OB_RECALC_OB, "OBJECT", 0, N_("Object"), ""}, - {OB_RECALC_DATA, "DATA", 0, N_("Data"), ""}, - {OB_RECALC_TIME, "TIME", 0, N_("Time"), ""}, + {OB_RECALC_OB, "OBJECT", 0, "Object", ""}, + {OB_RECALC_DATA, "DATA", 0, "Data", ""}, + {OB_RECALC_TIME, "TIME", 0, "Time", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "ID", NULL); - RNA_def_struct_ui_text(srna, "ID", N_("Base type for datablocks, defining a unique name, linking from other libraries and garbage collection")); + RNA_def_struct_ui_text(srna, "ID", "Base type for datablocks, defining a unique name, linking from other libraries and garbage collection"); RNA_def_struct_flag(srna, STRUCT_ID|STRUCT_ID_REFCOUNT); RNA_def_struct_refine_func(srna, "rna_ID_refine"); RNA_def_struct_idprops_func(srna, "rna_ID_idprops"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_ui_text(prop, N_("Name"), N_("Unique datablock ID name")); + RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name"); RNA_def_property_string_funcs(prop, "rna_ID_name_get", "rna_ID_name_length", "rna_ID_name_set"); RNA_def_property_string_maxlength(prop, MAX_ID_NAME-2); RNA_def_property_editable_func(prop, "rna_ID_name_editable"); @@ -458,44 +456,44 @@ static void rna_def_ID(BlenderRNA *brna) prop= RNA_def_property(srna, "users", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "us"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Users"), N_("Number of times this datablock is referenced")); + RNA_def_property_ui_text(prop, "Users", "Number of times this datablock is referenced"); prop= RNA_def_property(srna, "use_fake_user", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_FAKEUSER); - RNA_def_property_ui_text(prop, N_("Fake User"), N_("Saves this datablock even if it has no users")); + RNA_def_property_ui_text(prop, "Fake User", "Saves this datablock even if it has no users"); RNA_def_property_boolean_funcs(prop, NULL, "rna_ID_fake_user_set"); prop= RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_DOIT); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); - RNA_def_property_ui_text(prop, N_("Tag"), N_("Tools can use this to tag data, (initial state is undefined)")); + RNA_def_property_ui_text(prop, "Tag", "Tools can use this to tag data, (initial state is undefined)"); prop= RNA_def_property(srna, "library", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "lib"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Library"), N_("Library file the datablock is linked from")); + RNA_def_property_ui_text(prop, "Library", "Library file the datablock is linked from"); /* functions */ func= RNA_def_function(srna, "copy", "rna_ID_copy"); RNA_def_function_ui_description(func, "Create a copy of this datablock (not supported for all datablocks)."); - parm= RNA_def_pointer(func, "id", "ID", "", N_("New copy of the ID.")); + parm= RNA_def_pointer(func, "id", "ID", "", "New copy of the ID."); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "user_clear", "rna_ID_user_clear"); - RNA_def_function_ui_description(func, N_("Clears the user count of a datablock so its not saved, on reload the data will be removed.")); + RNA_def_function_ui_description(func, "Clears the user count of a datablock so its not saved, on reload the data will be removed."); func= RNA_def_function(srna, "animation_data_create", "BKE_id_add_animdata"); - RNA_def_function_ui_description(func, N_("Create animation data to this ID, note that not all ID types support this.")); - parm= RNA_def_pointer(func, "anim_data", "AnimData", "", N_("New animation data or NULL.")); + RNA_def_function_ui_description(func, "Create animation data to this ID, note that not all ID types support this."); + parm= RNA_def_pointer(func, "anim_data", "AnimData", "", "New animation data or NULL."); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "animation_data_clear", "BKE_free_animdata"); - RNA_def_function_ui_description(func, N_("Clear animation on this this ID.")); + RNA_def_function_ui_description(func, "Clear animation on this this ID."); func= RNA_def_function(srna, "update_tag", "rna_ID_update_tag"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - RNA_def_function_ui_description(func, N_("Tag the id to update its display data.")); - RNA_def_enum_flag(func, "refresh", update_flag_items, 0, "", N_("Type of updates to perform.")); + RNA_def_function_ui_description(func, "Tag the id to update its display data."); + RNA_def_enum_flag(func, "refresh", update_flag_items, 0, "", "Type of updates to perform."); } static void rna_def_library(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 92bacfe2a60..165a8e3af81 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -100,114 +100,6 @@ void RNA_exit(void) RNA_free(&BLENDER_RNA); } -/* make every name and description field surrounded by gettext */ -EnumPropertyItem* RNA_enum_items_gettexted(EnumPropertyItem *item) -{ - if( item ) - { - int i; - for(i=0; item[i].identifier; i++) - { - if( item[i].name ) - item[i].name = _(item[i].name); - if( item[i].description ) - item[i].description = _(item[i].description); - } - } - return item; -} - -void RNA_struct_gettexted( StructRNA* ptr ) -{ - PropertyRNA *temp_property, *end_property; - - ptr->name = _(ptr->name); - ptr->description = _(ptr->description); - - temp_property = (PropertyRNA*)ptr->cont.properties.first; - end_property = (PropertyRNA*)ptr->cont.properties.last; - while( temp_property!=end_property ) - { - temp_property->name = _(temp_property->name); - temp_property->description = _(temp_property->description); - if( temp_property->type == PROP_ENUM ) - RNA_enum_items_gettexted( ((EnumPropertyRNA*)temp_property)->item ); - temp_property = temp_property->next; - } - if( end_property!=NULL ) - { - end_property->name = _(end_property->name); - end_property->description = _(end_property->description); - if( end_property->type == PROP_ENUM ) - RNA_enum_items_gettexted( ((EnumPropertyRNA*)end_property)->item ); - } -} - -void RNA_types_init_gettext(void) -{ - StructRNA* target_struct[] = { - &RNA_Action, &RNA_ActionFCurves, &RNA_ActionGroup, &RNA_ActionGroups, &RNA_ActionPoseMarkers, - &RNA_BackgroundImage, - &RNA_ConsoleLine, - &RNA_Constraint, - &RNA_DopeSheet, - &RNA_Event, - &RNA_FileSelectParams, - &RNA_ID, - &RNA_KeyMap, &RNA_KeyMapItem, &RNA_KeyMapItems, - &RNA_KeyboardSensor, - &RNA_KeyingSetsAll, - &RNA_Macro, - - &RNA_Material, &RNA_MaterialHalo, &RNA_MaterialRaytraceMirror, &RNA_MaterialRaytraceTransparency, - &RNA_MaterialSlot, &RNA_MaterialStrand, &RNA_MaterialSubsurfaceScattering, - &RNA_MaterialTextureSlot, &RNA_MaterialVolume, - &RNA_Mesh, - &RNA_Modifier, - - &RNA_Object, - &RNA_ParticleSettingsTextureSlot, - &RNA_RenderLayer, &RNA_RenderSettings, - - &RNA_Scene, &RNA_SceneRenderLayer, - &RNA_Scopes, - - &RNA_Space, - &RNA_SpaceConsole, - &RNA_SpaceDopeSheetEditor, - &RNA_SpaceFileBrowser, - &RNA_SpaceGraphEditor, - &RNA_SpaceImageEditor, - &RNA_SpaceInfo, - &RNA_SpaceLogicEditor, - &RNA_SpaceNLA, - &RNA_SpaceNodeEditor, - &RNA_SpaceOutliner, - &RNA_SpaceProperties, - &RNA_SpaceSequenceEditor, - &RNA_SpaceTextEditor, - &RNA_SpaceTimeline, - &RNA_SpaceView3D, - &RNA_SpaceUVEditor, - &RNA_SpaceUserPreferences, - - &RNA_Texture, &RNA_TextureSlot, - &RNA_Theme, &RNA_ThemeBoneColorSet, &RNA_ThemeWidgetColors, - &RNA_ToolSettings, - &RNA_UserPreferences, &RNA_UserPreferencesEdit, &RNA_UserPreferencesFilePaths, - &RNA_UserPreferencesInput, &RNA_UserPreferencesSystem, &RNA_UserPreferencesView, - &RNA_UnitSettings, - &RNA_World, &RNA_WorldLighting, - /* for test */ - NULL - }; - int i=0; - for( i=0; target_struct[i]!=NULL; i++ ) - { - RNA_struct_gettexted( target_struct[i] ); - } -} - /* Pointer */ void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr) @@ -559,8 +451,10 @@ static const char *rna_ensure_property_identifier(PropertyRNA *prop) static const char *rna_ensure_property_description(PropertyRNA *prop) { + const char *description= NULL; + if(prop->magic == RNA_MAGIC) - return prop->description; + description= prop->description; else { /* attempt to get the local ID values */ IDProperty *idp_ui= rna_idproperty_ui(prop); @@ -568,19 +462,36 @@ static const char *rna_ensure_property_description(PropertyRNA *prop) if(idp_ui) { IDProperty *item= IDP_GetPropertyTypeFromGroup(idp_ui, "description", IDP_STRING); if(item) - return IDP_String(item); + description= IDP_String(item); } - return ((IDProperty*)prop)->name; /* XXX - not correct */ + if(description == NULL) + description= ((IDProperty*)prop)->name; /* XXX - not correct */ } + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS)) + description= BLF_gettext(description); +#endif + + return description; } static const char *rna_ensure_property_name(PropertyRNA *prop) { + const char *name; + if(prop->magic == RNA_MAGIC) - return prop->name; + name= prop->name; else - return ((IDProperty*)prop)->name; + name= ((IDProperty*)prop)->name; + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) + name= BLF_gettext(name); +#endif + + return name; } /* Structs */ @@ -1235,6 +1146,7 @@ void RNA_property_enum_items(bContext *C, PointerRNA *ptr, PropertyRNA *prop, En *totitem= tot; } + } else { *item= eprop->item; @@ -1243,6 +1155,45 @@ void RNA_property_enum_items(bContext *C, PointerRNA *ptr, PropertyRNA *prop, En } } +void RNA_property_enum_items_gettexted(bContext *C, PointerRNA *ptr, PropertyRNA *prop, EnumPropertyItem **item, int *totitem, int *free) +{ + RNA_property_enum_items(C, ptr, prop, item, totitem, free); + +#ifdef INTERNATIONAL + if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) { + int i; + EnumPropertyItem *nitem; + + if(*free) { + nitem= *item; + } else { + int totitem= 0; + + /* count */ + for(i=0; (*item)[i].identifier; i++) + totitem++; + + nitem= MEM_callocN(sizeof(EnumPropertyItem)*(totitem+1), "enum_items_gettexted"); + + for(i=0; (*item)[i].identifier; i++) + nitem[i]= (*item)[i]; + + *free= 1; + } + + for(i=0; nitem[i].identifier; i++) { + if( nitem[i].name ) + nitem[i].name = BLF_gettext(nitem[i].name); + if( nitem[i].description ) + nitem[i].description = BLF_gettext(nitem[i].description); + } + + *item= nitem; + } +#endif +} + + int RNA_property_enum_value(bContext *C, PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *value) { EnumPropertyItem *item, *item_array; diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 9b18a8be277..815a9c92968 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -30,8 +30,6 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BLF_api.h" - #include "rna_internal.h" #include "DNA_anim_types.h" @@ -255,13 +253,13 @@ static void rna_def_dopesheet(BlenderRNA *brna) srna= RNA_def_struct(brna, "DopeSheet", NULL); RNA_def_struct_sdna(srna, "bDopeSheet"); - RNA_def_struct_ui_text(srna, N_("DopeSheet"), N_("Settings for filtering the channels shown in Animation Editors")); + RNA_def_struct_ui_text(srna, "DopeSheet", "Settings for filtering the channels shown in Animation Editors"); /* Source of DopeSheet data */ // XXX: make this obsolete? prop= RNA_def_property(srna, "source", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "ID"); - RNA_def_property_ui_text(prop, N_("Source"), N_("ID-Block representing source data, currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil)")); + RNA_def_property_ui_text(prop, "Source", "ID-Block representing source data, currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil)"); /* Show datablock filters */ prop= RNA_def_property(srna, "show_datablock_filters", PROP_BOOLEAN, PROP_NONE); @@ -273,149 +271,149 @@ static void rna_def_dopesheet(BlenderRNA *brna) /* General Filtering Settings */ prop= RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYSEL); - RNA_def_property_ui_text(prop, N_("Only Selected"), N_("Only include channels relating to selected objects and data")); + RNA_def_property_ui_text(prop, "Only Selected", "Only include channels relating to selected objects and data"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_INCL_HIDDEN); - RNA_def_property_ui_text(prop, N_("Display Hidden"), N_("Include channels from objects/bone that aren't visible")); + RNA_def_property_ui_text(prop, "Display Hidden", "Include channels from objects/bone that aren't visible"); RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); /* Object Group Filtering Settings */ prop= RNA_def_property(srna, "show_only_group_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYOBGROUP); - RNA_def_property_ui_text(prop, N_("Only Objects in Group"), N_("Only include channels from Objects in the specified Group")); + RNA_def_property_ui_text(prop, "Only Objects in Group", "Only include channels from Objects in the specified Group"); RNA_def_property_ui_icon(prop, ICON_GROUP, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "filter_group", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "filter_grp"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Filtering Group"), N_("Group that included Object should be a member of")); + RNA_def_property_ui_text(prop, "Filtering Group", "Group that included Object should be a member of"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); /* FCurve Display Name Search Settings */ prop= RNA_def_property(srna, "show_only_matching_fcurves", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_BY_FCU_NAME); - RNA_def_property_ui_text(prop, N_("Only Matching F-Curves"), N_("Only include F-Curves with names containing search text")); + RNA_def_property_ui_text(prop, "Only Matching F-Curves", "Only include F-Curves with names containing search text"); RNA_def_property_ui_icon(prop, ICON_VIEWZOOM, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "filter_fcurve_name", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "searchstr"); - RNA_def_property_ui_text(prop, N_("F-Curve Name Filter"), N_("F-Curve live filtering string")); + RNA_def_property_ui_text(prop, "F-Curve Name Filter", "F-Curve live filtering string"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); /* NLA Specific Settings */ prop= RNA_def_property(srna, "show_missing_nla", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT); - RNA_def_property_ui_text(prop, N_("Include Missing NLA"), N_("Include Animation Data blocks with no NLA data. (NLA Editor only)")); + RNA_def_property_ui_text(prop, "Include Missing NLA", "Include Animation Data blocks with no NLA data. (NLA Editor only)"); RNA_def_property_ui_icon(prop, ICON_ACTION, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); /* Summary Settings (DopeSheet editors only) */ prop= RNA_def_property(srna, "show_summary", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY); - RNA_def_property_ui_text(prop, N_("Display Summary"), N_("Display an additional 'summary' line. (DopeSheet Editors only)")); + RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line. (DopeSheet Editors only)"); RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_expanded_summary", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED); - RNA_def_property_ui_text(prop, N_("Collapse Summary"), N_("Collapse summary when shown, so all other channels get hidden. (DopeSheet Editors Only)")); + RNA_def_property_ui_text(prop, "Collapse Summary", "Collapse summary when shown, so all other channels get hidden. (DopeSheet Editors Only)"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); /* General DataType Filtering Settings */ prop= RNA_def_property(srna, "show_transforms", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOOBJ); - RNA_def_property_ui_text(prop, N_("Display Transforms"), N_("Include visualization of Object-level Animation data (mostly Transforms)")); + RNA_def_property_ui_text(prop, "Display Transforms", "Include visualization of Object-level Animation data (mostly Transforms)"); RNA_def_property_ui_icon(prop, ICON_MANIPUL, 0); // XXX? RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_shapekeys", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSHAPEKEYS); - RNA_def_property_ui_text(prop, N_("Display Shapekeys"), N_("Include visualization of ShapeKey related Animation data")); + RNA_def_property_ui_text(prop, "Display Shapekeys", "Include visualization of ShapeKey related Animation data"); RNA_def_property_ui_icon(prop, ICON_SHAPEKEY_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_meshes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMESH); - RNA_def_property_ui_text(prop, N_("Display Meshes"), N_("Include visualization of Mesh related Animation data")); + RNA_def_property_ui_text(prop, "Display Meshes", "Include visualization of Mesh related Animation data"); RNA_def_property_ui_icon(prop, ICON_MESH_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_lattices", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAT); - RNA_def_property_ui_text(prop, N_("Display Lattices"), N_("Include visualization of Lattice related Animation data")); + RNA_def_property_ui_text(prop, "Display Lattices", "Include visualization of Lattice related Animation data"); RNA_def_property_ui_icon(prop, ICON_LATTICE_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_cameras", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCAM); - RNA_def_property_ui_text(prop, N_("Display Camera"), N_("Include visualization of Camera related Animation data")); + RNA_def_property_ui_text(prop, "Display Camera", "Include visualization of Camera related Animation data"); RNA_def_property_ui_icon(prop, ICON_CAMERA_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_materials", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMAT); - RNA_def_property_ui_text(prop, N_("Display Material"), N_("Include visualization of Material related Animation data")); + RNA_def_property_ui_text(prop, "Display Material", "Include visualization of Material related Animation data"); RNA_def_property_ui_icon(prop, ICON_MATERIAL_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_lamps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAM); - RNA_def_property_ui_text(prop, N_("Display Lamp"), N_("Include visualization of Lamp related Animation data")); + RNA_def_property_ui_text(prop, "Display Lamp", "Include visualization of Lamp related Animation data"); RNA_def_property_ui_icon(prop, ICON_LAMP_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOTEX); - RNA_def_property_ui_text(prop, N_("Display Texture"), N_("Include visualization of Texture related Animation data")); + RNA_def_property_ui_text(prop, "Display Texture", "Include visualization of Texture related Animation data"); RNA_def_property_ui_icon(prop, ICON_TEXTURE_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_curves", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCUR); - RNA_def_property_ui_text(prop, N_("Display Curve"), N_("Include visualization of Curve related Animation data")); + RNA_def_property_ui_text(prop, "Display Curve", "Include visualization of Curve related Animation data"); RNA_def_property_ui_icon(prop, ICON_CURVE_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_worlds", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOWOR); - RNA_def_property_ui_text(prop, N_("Display World"), N_("Include visualization of World related Animation data")); + RNA_def_property_ui_text(prop, "Display World", "Include visualization of World related Animation data"); RNA_def_property_ui_icon(prop, ICON_WORLD_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_scenes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSCE); - RNA_def_property_ui_text(prop, N_("Display Scene"), N_("Include visualization of Scene related Animation data")); + RNA_def_property_ui_text(prop, "Display Scene", "Include visualization of Scene related Animation data"); RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_particles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOPART); - RNA_def_property_ui_text(prop, N_("Display Particle"), N_("Include visualization of Particle related Animation data")); + RNA_def_property_ui_text(prop, "Display Particle", "Include visualization of Particle related Animation data"); RNA_def_property_ui_icon(prop, ICON_PARTICLE_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_metaballs", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMBA); - RNA_def_property_ui_text(prop, N_("Display Metaball"), N_("Include visualization of Metaball related Animation data")); + RNA_def_property_ui_text(prop, "Display Metaball", "Include visualization of Metaball related Animation data"); RNA_def_property_ui_icon(prop, ICON_META_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_armatures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOARM); - RNA_def_property_ui_text(prop, N_("Display Armature"), N_("Include visualization of Armature related Animation data")); + RNA_def_property_ui_text(prop, "Display Armature", "Include visualization of Armature related Animation data"); RNA_def_property_ui_icon(prop, ICON_ARMATURE_DATA, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NONTREE); - RNA_def_property_ui_text(prop, N_("Display Node"), N_("Include visualization of Node related Animation data")); + RNA_def_property_ui_text(prop, "Display Node", "Include visualization of Node related Animation data"); RNA_def_property_ui_icon(prop, ICON_NODETREE, 0); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); @@ -433,10 +431,10 @@ static void rna_def_action_group(BlenderRNA *brna) srna= RNA_def_struct(brna, "ActionGroup", NULL); RNA_def_struct_sdna(srna, "bActionGroup"); - RNA_def_struct_ui_text(srna, N_("Action Group"), N_("Groups of F-Curves")); + RNA_def_struct_ui_text(srna, "Action Group", "Groups of F-Curves"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_ui_text(prop, N_("Name"), ""); + RNA_def_property_ui_text(prop, "Name", ""); RNA_def_struct_name_property(srna, prop); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); @@ -454,26 +452,26 @@ static void rna_def_action_group(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "channels", NULL); RNA_def_property_struct_type(prop, "FCurve"); RNA_def_property_collection_funcs(prop, 0, "rna_ActionGroup_channels_next", 0, 0, 0, 0, 0); - RNA_def_property_ui_text(prop, N_("Channels"), N_("F-Curves in this group")); + RNA_def_property_ui_text(prop, "Channels", "F-Curves in this group"); prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED); - RNA_def_property_ui_text(prop, N_("Select"), N_("Action Group is selected")); + RNA_def_property_ui_text(prop, "Select", "Action Group is selected"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_SELECTED, NULL); prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED); - RNA_def_property_ui_text(prop, N_("Lock"), N_("Action Group is locked")); + RNA_def_property_ui_text(prop, "Lock", "Action Group is locked"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_EXPANDED); - RNA_def_property_ui_text(prop, N_("Expanded"), N_("Action Group is expanded")); + RNA_def_property_ui_text(prop, "Expanded", "Action Group is expanded"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "custom_color", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "customCol"); - RNA_def_property_ui_text(prop, N_("Custom Color"), N_("Index of custom color set")); + RNA_def_property_ui_text(prop, "Custom Color", "Index of custom color set"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); } @@ -488,21 +486,21 @@ static void rna_def_action_groups(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "ActionGroups"); srna= RNA_def_struct(brna, "ActionGroups", NULL); RNA_def_struct_sdna(srna, "bAction"); - RNA_def_struct_ui_text(srna, N_("Action Groups"), N_("Collection of action groups")); + RNA_def_struct_ui_text(srna, "Action Groups", "Collection of action groups"); func= RNA_def_function(srna, "new", "rna_Action_groups_new"); RNA_def_function_ui_description(func, "Add a keyframe to the curve."); - parm= RNA_def_string(func, "name", "Group", 0, "", N_("New name for the action group.")); + parm= RNA_def_string(func, "name", "Group", 0, "", "New name for the action group."); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "action_group", "ActionGroup", "", N_("Newly created action group")); + parm= RNA_def_pointer(func, "action_group", "ActionGroup", "", "Newly created action group"); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "remove", "rna_Action_groups_remove"); RNA_def_function_ui_description(func, "Remove action group."); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "action_group", "ActionGroup", "", N_("Action group to remove.")); + parm= RNA_def_pointer(func, "action_group", "ActionGroup", "", "Action group to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); } @@ -516,24 +514,24 @@ static void rna_def_action_fcurves(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "ActionFCurves"); srna= RNA_def_struct(brna, "ActionFCurves", NULL); RNA_def_struct_sdna(srna, "bAction"); - RNA_def_struct_ui_text(srna, N_("Action FCurves"), N_("Collection of action fcurves")); + RNA_def_struct_ui_text(srna, "Action FCurves", "Collection of action fcurves"); func= RNA_def_function(srna, "new", "rna_Action_fcurve_new"); - RNA_def_function_ui_description(func, N_("Add a keyframe to the curve.")); + RNA_def_function_ui_description(func, "Add a keyframe to the curve."); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_string(func, "data_path", "", 0, N_("Data Path"), N_("FCurve data path to use.")); + parm= RNA_def_string(func, "data_path", "", 0, "Data Path", "FCurve data path to use."); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index.", 0, INT_MAX); - RNA_def_string(func, "action_group", "", 0, N_("Action Group"), N_("Acton group to add this fcurve into.")); + RNA_def_string(func, "action_group", "", 0, "Action Group", "Acton group to add this fcurve into."); - parm= RNA_def_pointer(func, "fcurve", "FCurve", "", N_("Newly created fcurve")); + parm= RNA_def_pointer(func, "fcurve", "FCurve", "", "Newly created fcurve"); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "remove", "rna_Action_fcurve_remove"); RNA_def_function_ui_description(func, "Remove action group."); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "fcurve", "FCurve", "", N_("FCurve to remove.")); + parm= RNA_def_pointer(func, "fcurve", "FCurve", "", "FCurve to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); } @@ -548,33 +546,33 @@ static void rna_def_action_pose_markers(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "ActionPoseMarkers"); srna= RNA_def_struct(brna, "ActionPoseMarkers", NULL); RNA_def_struct_sdna(srna, "bAction"); - RNA_def_struct_ui_text(srna, N_("Action Pose Markers"), N_("Collection of timeline markers")); + RNA_def_struct_ui_text(srna, "Action Pose Markers", "Collection of timeline markers"); func= RNA_def_function(srna, "new", "rna_Action_pose_markers_new"); - RNA_def_function_ui_description(func, N_("Add a pose marker to the action.")); + RNA_def_function_ui_description(func, "Add a pose marker to the action."); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_string(func, "name", "Marker", 0, "", N_("New name for the marker (not unique).")); + parm= RNA_def_string(func, "name", "Marker", 0, "", "New name for the marker (not unique)."); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "marker", "TimelineMarker", "", N_("Newly created marker")); + parm= RNA_def_pointer(func, "marker", "TimelineMarker", "", "Newly created marker"); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "remove", "rna_Action_pose_markers_remove"); - RNA_def_function_ui_description(func, N_("Remove a timeline marker.")); + RNA_def_function_ui_description(func, "Remove a timeline marker."); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "marker", "TimelineMarker", "", N_("Timeline marker to remove.")); + parm= RNA_def_pointer(func, "marker", "TimelineMarker", "", "Timeline marker to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); prop= RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "TimelineMarker"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_Action_active_pose_marker_get", "rna_Action_active_pose_marker_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Active Pose Marker"), N_("Active pose marker for this Action")); + RNA_def_property_ui_text(prop, "Active Pose Marker", "Active pose marker for this Action"); prop= RNA_def_property(srna, "active_index", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "active_marker"); RNA_def_property_int_funcs(prop, "rna_Action_active_pose_marker_index_get", "rna_Action_active_pose_marker_index_set", "rna_Action_active_pose_marker_index_range"); - RNA_def_property_ui_text(prop, N_("Active Pose Marker Index"), N_("Index of active pose marker")); + RNA_def_property_ui_text(prop, "Active Pose Marker Index", "Index of active pose marker"); } static void rna_def_action(BlenderRNA *brna) @@ -584,30 +582,30 @@ static void rna_def_action(BlenderRNA *brna) srna= RNA_def_struct(brna, "Action", "ID"); RNA_def_struct_sdna(srna, "bAction"); - RNA_def_struct_ui_text(srna, N_("Action"), N_("A collection of F-Curves for animation")); + RNA_def_struct_ui_text(srna, "Action", "A collection of F-Curves for animation"); RNA_def_struct_ui_icon(srna, ICON_ACTION); /* collections */ prop= RNA_def_property(srna, "fcurves", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "curves", NULL); RNA_def_property_struct_type(prop, "FCurve"); - RNA_def_property_ui_text(prop, N_("F-Curves"), N_("The individual F-Curves that make up the Action")); + RNA_def_property_ui_text(prop, "F-Curves", "The individual F-Curves that make up the Action"); rna_def_action_fcurves(brna, prop); prop= RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "groups", NULL); RNA_def_property_struct_type(prop, "ActionGroup"); - RNA_def_property_ui_text(prop, N_("Groups"), N_("Convenient groupings of F-Curves")); + RNA_def_property_ui_text(prop, "Groups", "Convenient groupings of F-Curves"); rna_def_action_groups(brna, prop); prop= RNA_def_property(srna, "pose_markers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "markers", NULL); RNA_def_property_struct_type(prop, "TimelineMarker"); - RNA_def_property_ui_text(prop, N_("Pose Markers"), N_("Markers specific to this Action, for labeling poses")); + RNA_def_property_ui_text(prop, "Pose Markers", "Markers specific to this Action, for labeling poses"); rna_def_action_pose_markers(brna, prop); /* properties */ - prop= RNA_def_float_vector(srna, "frame_range" , 2 , NULL , 0, 0, N_("Frame Range") , N_("The final frame range of all fcurves within this action") , 0 , 0); + prop= RNA_def_float_vector(srna, "frame_range" , 2 , NULL , 0, 0, "Frame Range" , "The final frame range of all fcurves within this action" , 0 , 0); RNA_def_property_float_funcs(prop, "rna_Action_frame_range_get" , NULL, NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -615,7 +613,7 @@ static void rna_def_action(BlenderRNA *brna) prop= RNA_def_property(srna, "id_root", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "idroot"); RNA_def_property_enum_items(prop, id_type_items); - RNA_def_property_ui_text(prop, N_("ID Root Type"), N_("Type of ID-block that action can be used on. DO NOT CHANGE UNLESS YOU KNOW WHAT YOU'RE DOING")); + RNA_def_property_ui_text(prop, "ID Root Type", "Type of ID-block that action can be used on. DO NOT CHANGE UNLESS YOU KNOW WHAT YOU'RE DOING"); /* API calls */ RNA_api_action(srna); diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 0dc72d6249d..cea130a4b74 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -33,8 +33,6 @@ #include "RNA_define.h" #include "rna_internal.h" -#include "BLF_api.h" - #include "DNA_color_types.h" #include "DNA_texture_types.h" @@ -565,40 +563,40 @@ static void rna_def_scopes(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "Scopes", NULL); - RNA_def_struct_ui_text(srna, N_("Scopes"), N_("Scopes for statistical view of an image")); + RNA_def_struct_ui_text(srna, "Scopes", "Scopes for statistical view of an image"); prop= RNA_def_property(srna, "use_full_resolution", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, "Scopes", "sample_full", 1); - RNA_def_property_ui_text(prop, N_("Full Sample"), N_("Sample every pixel of the image")); + RNA_def_property_ui_text(prop, "Full Sample", "Sample every pixel of the image"); RNA_def_property_update(prop, 0, "rna_Scopes_update"); prop= RNA_def_property(srna, "accuracy", PROP_FLOAT, PROP_PERCENTAGE); RNA_def_property_float_sdna(prop, "Scopes", "accuracy"); RNA_def_property_range(prop, 0.0, 100.0); RNA_def_property_ui_range(prop, 0.0, 100.0, 10, 1); - RNA_def_property_ui_text(prop, N_("Accuracy"), N_("Proportion of original image source pixel lines to sample")); + RNA_def_property_ui_text(prop, "Accuracy", "Proportion of original image source pixel lines to sample"); RNA_def_property_update(prop, 0, "rna_Scopes_update"); prop= RNA_def_property(srna, "histogram", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, "Scopes", "hist"); RNA_def_property_struct_type(prop, "Histogram"); - RNA_def_property_ui_text(prop, N_("Histogram"), N_("Histogram for viewing image statistics")); + RNA_def_property_ui_text(prop, "Histogram", "Histogram for viewing image statistics"); prop= RNA_def_property(srna, "waveform_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, "Scopes", "wavefrm_mode"); RNA_def_property_enum_items(prop, prop_wavefrm_mode_items); - RNA_def_property_ui_text(prop, N_("Waveform Mode"), ""); + RNA_def_property_ui_text(prop, "Waveform Mode", ""); RNA_def_property_update(prop, 0, "rna_Scopes_update"); prop= RNA_def_property(srna, "waveform_alpha", PROP_FLOAT, PROP_PERCENTAGE); RNA_def_property_float_sdna(prop, "Scopes", "wavefrm_alpha"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Waveform Opacity"), N_("Opacity of the points")); + RNA_def_property_ui_text(prop, "Waveform Opacity", "Opacity of the points"); prop= RNA_def_property(srna, "vectorscope_alpha", PROP_FLOAT, PROP_PERCENTAGE); RNA_def_property_float_sdna(prop, "Scopes", "vecscope_alpha"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Vectorscope Opacity"), N_("Opacity of the points")); + RNA_def_property_ui_text(prop, "Vectorscope Opacity", "Opacity of the points"); } diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 47f7c754ff0..22d9a19f933 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -32,7 +32,6 @@ #include "rna_internal.h" #include "BLI_math.h" -#include "BLF_api.h" #include "DNA_action_types.h" #include "DNA_constraint_types.h" @@ -44,34 +43,34 @@ #include "WM_types.h" EnumPropertyItem constraint_type_items[] ={ - {0, "", 0, N_("Transform"), ""}, - {CONSTRAINT_TYPE_LOCLIKE, "COPY_LOCATION", ICON_CONSTRAINT_DATA, N_("Copy Location"), ""}, - {CONSTRAINT_TYPE_ROTLIKE, "COPY_ROTATION", ICON_CONSTRAINT_DATA, N_("Copy Rotation"), ""}, - {CONSTRAINT_TYPE_SIZELIKE, "COPY_SCALE", ICON_CONSTRAINT_DATA, N_("Copy Scale"), ""}, - {CONSTRAINT_TYPE_TRANSLIKE, "COPY_TRANSFORMS", ICON_CONSTRAINT_DATA, N_("Copy Transforms"), ""}, - {CONSTRAINT_TYPE_DISTLIMIT, "LIMIT_DISTANCE", ICON_CONSTRAINT_DATA, N_("Limit Distance"), ""}, - {CONSTRAINT_TYPE_LOCLIMIT, "LIMIT_LOCATION", ICON_CONSTRAINT_DATA, N_("Limit Location"), ""}, - {CONSTRAINT_TYPE_ROTLIMIT, "LIMIT_ROTATION", ICON_CONSTRAINT_DATA, N_("Limit Rotation"), ""}, - {CONSTRAINT_TYPE_SIZELIMIT, "LIMIT_SCALE", ICON_CONSTRAINT_DATA, N_("Limit Scale"), ""}, - {CONSTRAINT_TYPE_SAMEVOL, "MAINTAIN_VOLUME", ICON_CONSTRAINT_DATA, N_("Maintain Volume"), ""}, - {CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT_DATA, N_("Transformation"), ""}, - {0, "", 0, N_("Tracking"), ""}, - {CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT_DATA, N_("Clamp To"), ""}, - {CONSTRAINT_TYPE_DAMPTRACK, "DAMPED_TRACK", ICON_CONSTRAINT_DATA, N_("Damped Track"), N_("Tracking by taking the shortest path")}, - {CONSTRAINT_TYPE_KINEMATIC, "IK", ICON_CONSTRAINT_DATA, N_("Inverse Kinematics"), ""}, - {CONSTRAINT_TYPE_LOCKTRACK, "LOCKED_TRACK", ICON_CONSTRAINT_DATA, N_("Locked Track"), N_("Tracking along a single axis")}, - {CONSTRAINT_TYPE_SPLINEIK, "SPLINE_IK", ICON_CONSTRAINT_DATA, N_("Spline IK"), ""}, - {CONSTRAINT_TYPE_STRETCHTO, "STRETCH_TO",ICON_CONSTRAINT_DATA, N_("Stretch To"), ""}, - {CONSTRAINT_TYPE_TRACKTO, "TRACK_TO", ICON_CONSTRAINT_DATA, N_("Track To"), N_("Legacy tracking constraint prone to twisting artifacts")}, - {0, "", 0, N_("Relationship"), ""}, - {CONSTRAINT_TYPE_ACTION, "ACTION", ICON_CONSTRAINT_DATA, N_("Action"), ""}, - {CONSTRAINT_TYPE_CHILDOF, "CHILD_OF", ICON_CONSTRAINT_DATA, N_("Child Of"), ""}, - {CONSTRAINT_TYPE_MINMAX, "FLOOR", ICON_CONSTRAINT_DATA, N_("Floor"), ""}, - {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CONSTRAINT_DATA, N_("Follow Path"), ""}, - {CONSTRAINT_TYPE_PIVOT, "PIVOT", ICON_CONSTRAINT_DATA, N_("Pivot"), ""}, - {CONSTRAINT_TYPE_RIGIDBODYJOINT, "RIGID_BODY_JOINT", ICON_CONSTRAINT_DATA, N_("Rigid Body Joint"), ""}, - {CONSTRAINT_TYPE_PYTHON, "SCRIPT", ICON_CONSTRAINT_DATA, N_("Script"), ""}, - {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT_DATA, N_("Shrinkwrap"), ""}, + {0, "", 0, "Transform", ""}, + {CONSTRAINT_TYPE_LOCLIKE, "COPY_LOCATION", ICON_CONSTRAINT_DATA, "Copy Location", ""}, + {CONSTRAINT_TYPE_ROTLIKE, "COPY_ROTATION", ICON_CONSTRAINT_DATA, "Copy Rotation", ""}, + {CONSTRAINT_TYPE_SIZELIKE, "COPY_SCALE", ICON_CONSTRAINT_DATA, "Copy Scale", ""}, + {CONSTRAINT_TYPE_TRANSLIKE, "COPY_TRANSFORMS", ICON_CONSTRAINT_DATA, "Copy Transforms", ""}, + {CONSTRAINT_TYPE_DISTLIMIT, "LIMIT_DISTANCE", ICON_CONSTRAINT_DATA, "Limit Distance", ""}, + {CONSTRAINT_TYPE_LOCLIMIT, "LIMIT_LOCATION", ICON_CONSTRAINT_DATA, "Limit Location", ""}, + {CONSTRAINT_TYPE_ROTLIMIT, "LIMIT_ROTATION", ICON_CONSTRAINT_DATA, "Limit Rotation", ""}, + {CONSTRAINT_TYPE_SIZELIMIT, "LIMIT_SCALE", ICON_CONSTRAINT_DATA, "Limit Scale", ""}, + {CONSTRAINT_TYPE_SAMEVOL, "MAINTAIN_VOLUME", ICON_CONSTRAINT_DATA, "Maintain Volume", ""}, + {CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT_DATA, "Transformation", ""}, + {0, "", 0, "Tracking", ""}, + {CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT_DATA, "Clamp To", ""}, + {CONSTRAINT_TYPE_DAMPTRACK, "DAMPED_TRACK", ICON_CONSTRAINT_DATA, "Damped Track", "Tracking by taking the shortest path"}, + {CONSTRAINT_TYPE_KINEMATIC, "IK", ICON_CONSTRAINT_DATA, "Inverse Kinematics", ""}, + {CONSTRAINT_TYPE_LOCKTRACK, "LOCKED_TRACK", ICON_CONSTRAINT_DATA, "Locked Track", "Tracking along a single axis"}, + {CONSTRAINT_TYPE_SPLINEIK, "SPLINE_IK", ICON_CONSTRAINT_DATA, "Spline IK", ""}, + {CONSTRAINT_TYPE_STRETCHTO, "STRETCH_TO",ICON_CONSTRAINT_DATA, "Stretch To", ""}, + {CONSTRAINT_TYPE_TRACKTO, "TRACK_TO", ICON_CONSTRAINT_DATA, "Track To", "Legacy tracking constraint prone to twisting artifacts"}, + {0, "", 0, "Relationship", ""}, + {CONSTRAINT_TYPE_ACTION, "ACTION", ICON_CONSTRAINT_DATA, "Action", ""}, + {CONSTRAINT_TYPE_CHILDOF, "CHILD_OF", ICON_CONSTRAINT_DATA, "Child Of", ""}, + {CONSTRAINT_TYPE_MINMAX, "FLOOR", ICON_CONSTRAINT_DATA, "Floor", ""}, + {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CONSTRAINT_DATA, "Follow Path", ""}, + {CONSTRAINT_TYPE_PIVOT, "PIVOT", ICON_CONSTRAINT_DATA, "Pivot", ""}, + {CONSTRAINT_TYPE_RIGIDBODYJOINT, "RIGID_BODY_JOINT", ICON_CONSTRAINT_DATA, "Rigid Body Joint", ""}, + {CONSTRAINT_TYPE_PYTHON, "SCRIPT", ICON_CONSTRAINT_DATA, "Script", ""}, + {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT_DATA, "Shrinkwrap", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem target_space_pchan_items[] = { diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 6930593ad04..3cf6feb005c 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -33,8 +33,6 @@ #include "rna_internal.h" -#include "BLF_api.h" - #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" @@ -48,23 +46,23 @@ #include "ED_curve.h" EnumPropertyItem beztriple_handle_type_items[] = { - {HD_FREE, "FREE", 0, N_("Free"), ""}, - {HD_VECT, "VECTOR", 0, N_("Vector"), ""}, - {HD_ALIGN, "ALIGNED", 0, N_("Aligned"), ""}, - {HD_AUTO, "AUTO", 0, N_("Auto"), ""}, + {HD_FREE, "FREE", 0, "Free", ""}, + {HD_VECT, "VECTOR", 0, "Vector", ""}, + {HD_ALIGN, "ALIGNED", 0, "Aligned", ""}, + {HD_AUTO, "AUTO", 0, "Auto", ""}, {0, NULL, 0, NULL, NULL}}; EnumPropertyItem keyframe_handle_type_items[] = { - {HD_FREE, "FREE", 0, N_("Free"), ""}, - {HD_VECT, "VECTOR", 0, N_("Vector"), ""}, - {HD_ALIGN, "ALIGNED", 0, N_("Aligned"), ""}, - {HD_AUTO, "AUTO", 0, N_("Automatic"), ""}, - {HD_AUTO_ANIM, "AUTO_CLAMPED", 0, N_("Auto Clamped"), N_("Auto handles clamped to not overshoot")}, + {HD_FREE, "FREE", 0, "Free", ""}, + {HD_VECT, "VECTOR", 0, "Vector", ""}, + {HD_ALIGN, "ALIGNED", 0, "Aligned", ""}, + {HD_AUTO, "AUTO", 0, "Automatic", ""}, + {HD_AUTO_ANIM, "AUTO_CLAMPED", 0, "Auto Clamped", "Auto handles clamped to not overshoot"}, {0, NULL, 0, NULL, NULL}}; EnumPropertyItem beztriple_interpolation_mode_items[] = { - {BEZT_IPO_CONST, "CONSTANT", 0, N_("Constant"), ""}, - {BEZT_IPO_LIN, "LINEAR", 0, N_("Linear"), ""}, + {BEZT_IPO_CONST, "CONSTANT", 0, "Constant", ""}, + {BEZT_IPO_LIN, "LINEAR", 0, "Linear", ""}, {BEZT_IPO_BEZ, "BEZIER", 0, "Bezier", ""}, {0, NULL, 0, NULL, NULL}}; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 45d19a4dc46..758ddc9ac6a 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -43,8 +43,6 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" -#include "BLF_api.h" - #include "RNA_define.h" #include "rna_internal.h" diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 33e76bc8131..e922a007249 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -41,8 +41,6 @@ #include "BLI_math.h" -#include "BLF_api.h" - #include "BKE_action.h" #include "WM_types.h" diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 3303ad0dde8..f407aba82fb 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -40,41 +40,39 @@ #include "WM_api.h" #include "WM_types.h" -#include "BLF_api.h" - static EnumPropertyItem prop_texture_coordinates_items[] = { -{TEXCO_GLOB, "GLOBAL", 0, N_("Global"), N_("Uses global coordinates for the texture coordinates")}, -{TEXCO_OBJECT, "OBJECT", 0, N_("Object"), N_("Uses linked object's coordinates for texture coordinates")}, -{TEXCO_UV, "UV", 0, "UV", N_("Uses UV coordinates for texture coordinates")}, -{TEXCO_ORCO, "ORCO", 0, N_("Generated"), N_("Uses the original undeformed coordinates of the object")}, -{TEXCO_STRAND, "STRAND", 0, N_("Strand / Particle"), N_("Uses normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)")}, -{TEXCO_STICKY, "STICKY", 0, N_("Sticky"), N_("Uses mesh's sticky coordinates for the texture coordinates")}, -{TEXCO_WINDOW, "WINDOW", 0, N_("Window"), N_("Uses screen coordinates as texture coordinates")}, -{TEXCO_NORM, "NORMAL", 0, N_("Normal"), N_("Uses normal vector as texture coordinates")}, -{TEXCO_REFL, "REFLECTION", 0, N_("Reflection"), N_("Uses reflection vector as texture coordinates")}, -{TEXCO_STRESS, "STRESS", 0, N_("Stress"), N_("Uses the difference of edge lengths compared to original coordinates of the mesh")}, -{TEXCO_TANGENT, "TANGENT", 0, N_("Tangent"), N_("Uses the optional tangent vector as texture coordinates")}, +{TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates"}, +{TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates"}, +{TEXCO_UV, "UV", 0, "UV", "Uses UV coordinates for texture coordinates"}, +{TEXCO_ORCO, "ORCO", 0, "Generated", "Uses the original undeformed coordinates of the object"}, +{TEXCO_STRAND, "STRAND", 0, "Strand / Particle", "Uses normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)"}, +{TEXCO_STICKY, "STICKY", 0, "Sticky", "Uses mesh's sticky coordinates for the texture coordinates"}, +{TEXCO_WINDOW, "WINDOW", 0, "Window", "Uses screen coordinates as texture coordinates"}, +{TEXCO_NORM, "NORMAL", 0, "Normal", "Uses normal vector as texture coordinates"}, +{TEXCO_REFL, "REFLECTION", 0, "Reflection", "Uses reflection vector as texture coordinates"}, +{TEXCO_STRESS, "STRESS", 0, "Stress", "Uses the difference of edge lengths compared to original coordinates of the mesh"}, +{TEXCO_TANGENT, "TANGENT", 0, "Tangent", "Uses the optional tangent vector as texture coordinates"}, {0, NULL, 0, NULL, NULL}}; EnumPropertyItem ramp_blend_items[] = { -{MA_RAMP_BLEND, "MIX", 0, N_("Mix"), ""}, -{MA_RAMP_ADD, "ADD", 0, N_("Add"), ""}, -{MA_RAMP_MULT, "MULTIPLY", 0, N_("Multiply"), ""}, -{MA_RAMP_SUB, "SUBTRACT", 0, N_("Subtract"), ""}, -{MA_RAMP_SCREEN, "SCREEN", 0, N_("Screen"), ""}, -{MA_RAMP_DIV, "DIVIDE", 0, N_("Divide"), ""}, -{MA_RAMP_DIFF, "DIFFERENCE", 0, N_("Difference"), ""}, -{MA_RAMP_DARK, "DARKEN", 0, N_("Darken"), ""}, -{MA_RAMP_LIGHT, "LIGHTEN", 0, N_("Lighten"), ""}, -{MA_RAMP_OVERLAY, "OVERLAY", 0, N_("Overlay"), ""}, -{MA_RAMP_DODGE, "DODGE", 0, N_("Dodge"), ""}, -{MA_RAMP_BURN, "BURN", 0, N_("Burn"), ""}, -{MA_RAMP_HUE, "HUE", 0, N_("Hue"), ""}, -{MA_RAMP_SAT, "SATURATION", 0, N_("Saturation"), ""}, -{MA_RAMP_VAL, "VALUE", 0, N_("Value"), ""}, -{MA_RAMP_COLOR, "COLOR", 0, N_("Color"), ""}, -{MA_RAMP_SOFT, "SOFT_LIGHT", 0, N_("Soft Light"), ""}, -{MA_RAMP_LINEAR, "LINEAR_LIGHT", 0, N_("Linear Light"), ""}, +{MA_RAMP_BLEND, "MIX", 0, "Mix", ""}, +{MA_RAMP_ADD, "ADD", 0, "Add", ""}, +{MA_RAMP_MULT, "MULTIPLY", 0, "Multiply", ""}, +{MA_RAMP_SUB, "SUBTRACT", 0, "Subtract", ""}, +{MA_RAMP_SCREEN, "SCREEN", 0, "Screen", ""}, +{MA_RAMP_DIV, "DIVIDE", 0, "Divide", ""}, +{MA_RAMP_DIFF, "DIFFERENCE", 0, "Difference", ""}, +{MA_RAMP_DARK, "DARKEN", 0, "Darken", ""}, +{MA_RAMP_LIGHT, "LIGHTEN", 0, "Lighten", ""}, +{MA_RAMP_OVERLAY, "OVERLAY", 0, "Overlay", ""}, +{MA_RAMP_DODGE, "DODGE", 0, "Dodge", ""}, +{MA_RAMP_BURN, "BURN", 0, "Burn", ""}, +{MA_RAMP_HUE, "HUE", 0, "Hue", ""}, +{MA_RAMP_SAT, "SATURATION", 0, "Saturation", ""}, +{MA_RAMP_VAL, "VALUE", 0, "Value", ""}, +{MA_RAMP_COLOR, "COLOR", 0, "Color", ""}, +{MA_RAMP_SOFT, "SOFT_LIGHT", 0, "Soft Light", ""}, +{MA_RAMP_LINEAR, "LINEAR_LIGHT", 0, "Linear Light", ""}, {0, NULL, 0, NULL, NULL}}; #ifdef RNA_RUNTIME @@ -377,364 +375,364 @@ static void rna_def_material_mtex(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_mapping_items[] = { - {MTEX_FLAT, "FLAT", 0, N_("Flat"), N_("Maps X and Y coordinates directly")}, - {MTEX_CUBE, "CUBE", 0, N_("Cube"), N_("Maps using the normal vector")}, - {MTEX_TUBE, "TUBE", 0, N_("Tube"), N_("Maps with Z as central axis")}, - {MTEX_SPHERE, "SPHERE", 0, N_("Sphere"), N_("Maps with Z as central axis")}, + {MTEX_FLAT, "FLAT", 0, "Flat", "Maps X and Y coordinates directly"}, + {MTEX_CUBE, "CUBE", 0, "Cube", "Maps using the normal vector"}, + {MTEX_TUBE, "TUBE", 0, "Tube", "Maps with Z as central axis"}, + {MTEX_SPHERE, "SPHERE", 0, "Sphere", "Maps with Z as central axis"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_x_mapping_items[] = { - {0, "NONE", 0, N_("None"), ""}, + {0, "NONE", 0, "None", ""}, {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_y_mapping_items[] = { - {0, "NONE", 0, N_("None"), ""}, + {0, "NONE", 0, "None", ""}, {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_z_mapping_items[] = { - {0, "NONE", 0, N_("None"), ""}, + {0, "NONE", 0, "None", ""}, {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_normal_map_space_items[] = { - {MTEX_NSPACE_CAMERA, "CAMERA", 0, N_("Camera"), ""}, - {MTEX_NSPACE_WORLD, "WORLD", 0, N_("World"), ""}, - {MTEX_NSPACE_OBJECT, "OBJECT", 0, N_("Object"), ""}, - {MTEX_NSPACE_TANGENT, "TANGENT", 0, N_("Tangent"), ""}, + {MTEX_NSPACE_CAMERA, "CAMERA", 0, "Camera", ""}, + {MTEX_NSPACE_WORLD, "WORLD", 0, "World", ""}, + {MTEX_NSPACE_OBJECT, "OBJECT", 0, "Object", ""}, + {MTEX_NSPACE_TANGENT, "TANGENT", 0, "Tangent", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_bump_method_items[] = { - {0, "BUMP_ORIGINAL", 0, N_("Original"), ""}, - {MTEX_COMPAT_BUMP, "BUMP_COMPATIBLE", 0, N_("Compatible"), ""}, - {MTEX_3TAP_BUMP, "BUMP_DEFAULT", 0, N_("Default"), ""}, - {MTEX_5TAP_BUMP, "BUMP_BEST_QUALITY", 0, N_("Best Quality"), ""}, + {0, "BUMP_ORIGINAL", 0, "Original", ""}, + {MTEX_COMPAT_BUMP, "BUMP_COMPATIBLE", 0, "Compatible", ""}, + {MTEX_3TAP_BUMP, "BUMP_DEFAULT", 0, "Default", ""}, + {MTEX_5TAP_BUMP, "BUMP_BEST_QUALITY", 0, "Best Quality", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_bump_space_items[] = { - {0, "BUMP_VIEWSPACE", 0, N_("ViewSpace"), ""}, - {MTEX_BUMP_OBJECTSPACE, "BUMP_OBJECTSPACE", 0, N_("ObjectSpace"), ""}, - {MTEX_BUMP_TEXTURESPACE, "BUMP_TEXTURESPACE", 0, N_("TextureSpace"), ""}, + {0, "BUMP_VIEWSPACE", 0, "ViewSpace", ""}, + {MTEX_BUMP_OBJECTSPACE, "BUMP_OBJECTSPACE", 0, "ObjectSpace", ""}, + {MTEX_BUMP_TEXTURESPACE, "BUMP_TEXTURESPACE", 0, "TextureSpace", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "MaterialTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, N_("Material Texture Slot"), N_("Texture slot for textures in a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Texture Slot", "Texture slot for textures in a Material datablock"); prop= RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); RNA_def_property_enum_items(prop, prop_texture_coordinates_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Material_texture_coordinates_itemf"); - RNA_def_property_ui_text(prop, N_("Texture Coordinates"), ""); + RNA_def_property_ui_text(prop, "Texture Coordinates", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "object"); RNA_def_property_struct_type(prop, "Object"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Object"), N_("Object to use for mapping with Object texture coordinates")); + RNA_def_property_ui_text(prop, "Object", "Object to use for mapping with Object texture coordinates"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "uvname"); - RNA_def_property_ui_text(prop, N_("UV Layer"), N_("UV layer to use for mapping with UV texture coordinates")); + RNA_def_property_ui_text(prop, "UV Layer", "UV layer to use for mapping with UV texture coordinates"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_from_dupli", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_DUPLI_MAPTO); - RNA_def_property_ui_text(prop, N_("From Dupli"), N_("Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent")); + RNA_def_property_ui_text(prop, "From Dupli", "Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_from_original", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_OB_DUPLI_ORIG); - RNA_def_property_ui_text(prop, N_("From Original"), N_("Dupli's derive their object coordinates from the original objects transformation")); + RNA_def_property_ui_text(prop, "From Original", "Dupli's derive their object coordinates from the original objects transformation"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_color_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COL); - RNA_def_property_ui_text(prop, N_("Diffuse Color"), N_("Causes the texture to affect basic color of the material")); + RNA_def_property_ui_text(prop, "Diffuse Color", "Causes the texture to affect basic color of the material"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_NORM); - RNA_def_property_ui_text(prop, N_("Normal"), N_("Causes the texture to affect the rendered normal")); + RNA_def_property_ui_text(prop, "Normal", "Causes the texture to affect the rendered normal"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_color_spec", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COLSPEC); - RNA_def_property_ui_text(prop, N_("Specular Color"), N_("Causes the texture to affect the specularity color")); + RNA_def_property_ui_text(prop, "Specular Color", "Causes the texture to affect the specularity color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_mirror", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COLMIR); - RNA_def_property_ui_text(prop, N_("Mirror"), N_("Causes the texture to affect the mirror color")); + RNA_def_property_ui_text(prop, "Mirror", "Causes the texture to affect the mirror color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_REF); - RNA_def_property_ui_text(prop, N_("Diffuse"), N_("Causes the texture to affect the value of the materials diffuse reflectivity")); + RNA_def_property_ui_text(prop, "Diffuse", "Causes the texture to affect the value of the materials diffuse reflectivity"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_SPEC); - RNA_def_property_ui_text(prop, N_("Specular"), N_("Causes the texture to affect the value of specular reflectivity")); + RNA_def_property_ui_text(prop, "Specular", "Causes the texture to affect the value of specular reflectivity"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_ambient", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_AMB); - RNA_def_property_ui_text(prop, N_("Ambient"), N_("Causes the texture to affect the value of ambient")); + RNA_def_property_ui_text(prop, "Ambient", "Causes the texture to affect the value of ambient"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_hardness", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_HAR); - RNA_def_property_ui_text(prop, N_("Hardness"), N_("Causes the texture to affect the hardness value")); + RNA_def_property_ui_text(prop, "Hardness", "Causes the texture to affect the hardness value"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_raymir", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_RAYMIRR); - RNA_def_property_ui_text(prop, N_("Ray-Mirror"), N_("Causes the texture to affect the ray-mirror value")); + RNA_def_property_ui_text(prop, "Ray-Mirror", "Causes the texture to affect the ray-mirror value"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_ALPHA); - RNA_def_property_ui_text(prop, N_("Alpha"), N_("Causes the texture to affect the alpha value")); + RNA_def_property_ui_text(prop, "Alpha", "Causes the texture to affect the alpha value"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMIT); - RNA_def_property_ui_text(prop, N_("Emit"), N_("Causes the texture to affect the emit value")); + RNA_def_property_ui_text(prop, "Emit", "Causes the texture to affect the emit value"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_translucency", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_TRANSLU); - RNA_def_property_ui_text(prop, N_("Translucency"), N_("Causes the texture to affect the translucency value")); + RNA_def_property_ui_text(prop, "Translucency", "Causes the texture to affect the translucency value"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_displacement", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_DISPLACE); - RNA_def_property_ui_text(prop, N_("Displacement"), N_("Let the texture displace the surface")); + RNA_def_property_ui_text(prop, "Displacement", "Let the texture displace the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_warp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_WARP); - RNA_def_property_ui_text(prop, N_("Warp"), N_("Let the texture warp texture coordinates of next channels")); + RNA_def_property_ui_text(prop, "Warp", "Let the texture warp texture coordinates of next channels"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "mapping_x", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projx"); RNA_def_property_enum_items(prop, prop_x_mapping_items); - RNA_def_property_ui_text(prop, N_("X Mapping"), ""); + RNA_def_property_ui_text(prop, "X Mapping", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "mapping_y", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projy"); RNA_def_property_enum_items(prop, prop_y_mapping_items); - RNA_def_property_ui_text(prop, N_("Y Mapping"), ""); + RNA_def_property_ui_text(prop, "Y Mapping", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "mapping_z", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projz"); RNA_def_property_enum_items(prop, prop_z_mapping_items); - RNA_def_property_ui_text(prop, N_("Z Mapping"), ""); + RNA_def_property_ui_text(prop, "Z Mapping", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_mapping_items); - RNA_def_property_ui_text(prop, N_("Mapping"), ""); + RNA_def_property_ui_text(prop, "Mapping", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "normal_map_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "normapspace"); RNA_def_property_enum_items(prop, prop_normal_map_space_items); - RNA_def_property_ui_text(prop, N_("Normal Map Space"), N_("Sets space of normal map image")); + RNA_def_property_ui_text(prop, "Normal Map Space", "Sets space of normal map image"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "normal_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "norfac"); RNA_def_property_ui_range(prop, -5, 5, 10, 3); - RNA_def_property_ui_text(prop, N_("Normal Factor"), N_("Amount texture affects normal values")); + RNA_def_property_ui_text(prop, "Normal Factor", "Amount texture affects normal values"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "displacement_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "dispfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Displacement Factor"), N_("Amount texture displaces the surface")); + RNA_def_property_ui_text(prop, "Displacement Factor", "Amount texture displaces the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "warp_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "warpfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Warp Factor"), N_("Amount texture affects texture coordinates of next channels")); + RNA_def_property_ui_text(prop, "Warp Factor", "Amount texture affects texture coordinates of next channels"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colspecfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Specular Color Factor"), N_("Amount texture affects specular color")); + RNA_def_property_ui_text(prop, "Specular Color Factor", "Amount texture affects specular color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Diffuse Color Factor"), N_("Amount texture affects diffuse color")); + RNA_def_property_ui_text(prop, "Diffuse Color Factor", "Amount texture affects diffuse color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "mirror_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "mirrfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Mirror Factor"), N_("Amount texture affects mirror color")); + RNA_def_property_ui_text(prop, "Mirror Factor", "Amount texture affects mirror color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "alpha_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "alphafac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Alpha Factor"), N_("Amount texture affects alpha")); + RNA_def_property_ui_text(prop, "Alpha Factor", "Amount texture affects alpha"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "difffac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Diffuse Factor"), N_("Amount texture affects diffuse reflectivity")); + RNA_def_property_ui_text(prop, "Diffuse Factor", "Amount texture affects diffuse reflectivity"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "specfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Specular Factor"), N_("Amount texture affects specular reflectivity")); + RNA_def_property_ui_text(prop, "Specular Factor", "Amount texture affects specular reflectivity"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "emit_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "emitfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Emit Factor"), N_("Amount texture affects emission")); + RNA_def_property_ui_text(prop, "Emit Factor", "Amount texture affects emission"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "hardness_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "hardfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Hardness Factor"), N_("Amount texture affects hardness")); + RNA_def_property_ui_text(prop, "Hardness Factor", "Amount texture affects hardness"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "raymir_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "raymirrfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Ray Mirror Factor"), N_("Amount texture affects ray mirror")); + RNA_def_property_ui_text(prop, "Ray Mirror Factor", "Amount texture affects ray mirror"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "translucency_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "translfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Translucency Factor"), N_("Amount texture affects translucency")); + RNA_def_property_ui_text(prop, "Translucency Factor", "Amount texture affects translucency"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ambient_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ambfac"); RNA_def_property_ui_range(prop, -1, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Ambient Factor"), N_("Amount texture affects ambient")); + RNA_def_property_ui_text(prop, "Ambient Factor", "Amount texture affects ambient"); RNA_def_property_update(prop, 0, "rna_Material_update"); /* volume material */ prop= RNA_def_property(srna, "use_map_color_emission", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMISSION_COL); - RNA_def_property_ui_text(prop, N_("Emission Color"), N_("Causes the texture to affect the color of emission")); + RNA_def_property_ui_text(prop, "Emission Color", "Causes the texture to affect the color of emission"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_color_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_REFLECTION_COL); - RNA_def_property_ui_text(prop, N_("Reflection Color"), N_("Causes the texture to affect the color of scattered light")); + RNA_def_property_ui_text(prop, "Reflection Color", "Causes the texture to affect the color of scattered light"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_color_transmission", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_TRANSMISSION_COL); - RNA_def_property_ui_text(prop, N_("Transmission Color"), N_("Causes the texture to affect the result color after other light has been scattered/absorbed")); + RNA_def_property_ui_text(prop, "Transmission Color", "Causes the texture to affect the result color after other light has been scattered/absorbed"); RNA_def_property_update(prop, NC_TEXTURE, NULL); prop= RNA_def_property(srna, "use_map_density", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_DENSITY); - RNA_def_property_ui_text(prop, N_("Density"), N_("Causes the texture to affect the volume's density")); + RNA_def_property_ui_text(prop, "Density", "Causes the texture to affect the volume's density"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_emission", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMISSION); - RNA_def_property_ui_text(prop, N_("Emission"), N_("Causes the texture to affect the volume's emission")); + RNA_def_property_ui_text(prop, "Emission", "Causes the texture to affect the volume's emission"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_scatter", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_SCATTERING); - RNA_def_property_ui_text(prop, N_("Scattering"), N_("Causes the texture to affect the volume's scattering")); + RNA_def_property_ui_text(prop, "Scattering", "Causes the texture to affect the volume's scattering"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_map_reflect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_REFLECTION); - RNA_def_property_ui_text(prop, N_("Reflection"), N_("Causes the texture to affect the reflected light's brightness")); + RNA_def_property_ui_text(prop, "Reflection", "Causes the texture to affect the reflected light's brightness"); RNA_def_property_update(prop, NC_TEXTURE, NULL); prop= RNA_def_property(srna, "emission_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colemitfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Emission Color Factor"), N_("Amount texture affects emission color")); + RNA_def_property_ui_text(prop, "Emission Color Factor", "Amount texture affects emission color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "reflection_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colreflfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Reflection Color Factor"), N_("Amount texture affects color of out-scattered light")); + RNA_def_property_ui_text(prop, "Reflection Color Factor", "Amount texture affects color of out-scattered light"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "transmission_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "coltransfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Transmission Color Factor"), N_("Amount texture affects result color after light has been scattered/absorbed")); + RNA_def_property_ui_text(prop, "Transmission Color Factor", "Amount texture affects result color after light has been scattered/absorbed"); RNA_def_property_update(prop, NC_TEXTURE, NULL); prop= RNA_def_property(srna, "density_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "densfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Density Factor"), N_("Amount texture affects density")); + RNA_def_property_ui_text(prop, "Density Factor", "Amount texture affects density"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "emission_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "emitfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Emission Factor"), N_("Amount texture affects emission")); + RNA_def_property_ui_text(prop, "Emission Factor", "Amount texture affects emission"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "scattering_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "scatterfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Scattering Factor"), N_("Amount texture affects scattering")); + RNA_def_property_ui_text(prop, "Scattering Factor", "Amount texture affects scattering"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "reflection_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "reflfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Reflection Factor"), N_("Amount texture affects brightness of out-scattered light")); + RNA_def_property_ui_text(prop, "Reflection Factor", "Amount texture affects brightness of out-scattered light"); RNA_def_property_update(prop, 0, "rna_Material_update"); /* end volume material */ prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_MaterialTextureSlot_use_get", "rna_MaterialTextureSlot_use_set"); - RNA_def_property_ui_text(prop, N_("Enabled"), N_("Enable this material texture slot")); + RNA_def_property_ui_text(prop, "Enabled", "Enable this material texture slot"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "bump_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "texflag"); RNA_def_property_enum_items(prop, prop_bump_method_items); - RNA_def_property_ui_text(prop, N_("Bump Method"), N_("Method to use for bump mapping")); + RNA_def_property_ui_text(prop, "Bump Method", "Method to use for bump mapping"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "bump_objectspace", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "texflag"); RNA_def_property_enum_items(prop, prop_bump_space_items); - RNA_def_property_ui_text(prop, N_("Bump Space"), N_("Space to apply bump mapping in")); + RNA_def_property_ui_text(prop, "Bump Space", "Space to apply bump mapping in"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -743,100 +741,100 @@ static void rna_def_material_colors(StructRNA *srna) PropertyRNA *prop; static EnumPropertyItem prop_ramp_input_items[] = { - {MA_RAMP_IN_SHADER, "SHADER", 0, N_("Shader"), ""}, - {MA_RAMP_IN_ENERGY, "ENERGY", 0, N_("Energy"), ""}, - {MA_RAMP_IN_NOR, "NORMAL", 0, N_("Normal"), ""}, - {MA_RAMP_IN_RESULT, "RESULT", 0, N_("Result"), ""}, + {MA_RAMP_IN_SHADER, "SHADER", 0, "Shader", ""}, + {MA_RAMP_IN_ENERGY, "ENERGY", 0, "Energy", ""}, + {MA_RAMP_IN_NOR, "NORMAL", 0, "Normal", ""}, + {MA_RAMP_IN_RESULT, "RESULT", 0, "Result", ""}, {0, NULL, 0, NULL, NULL}}; prop= RNA_def_property(srna, "diffuse_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "r"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Diffuse Color"), N_("Diffuse color of the material")); + RNA_def_property_ui_text(prop, "Diffuse Color", "Diffuse color of the material"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "specular_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "specr"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Specular Color"), N_("Specular color of the material")); + RNA_def_property_ui_text(prop, "Specular Color", "Specular color of the material"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "mirror_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "mirr"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Mirror Color"), N_("Mirror color of the material")); + RNA_def_property_ui_text(prop, "Mirror Color", "Mirror color of the material"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Alpha"), N_("Alpha transparency of the material")); + RNA_def_property_ui_text(prop, "Alpha", "Alpha transparency of the material"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "specular_alpha", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "spectra"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Specular Alpha"), N_("Alpha transparency for specular areas")); + RNA_def_property_ui_text(prop, "Specular Alpha", "Alpha transparency for specular areas"); RNA_def_property_update(prop, 0, "rna_Material_update"); /* Color bands */ prop= RNA_def_property(srna, "use_diffuse_ramp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAMP_COL); RNA_def_property_boolean_funcs(prop, NULL, "rna_Material_use_diffuse_ramp_set"); - RNA_def_property_ui_text(prop, N_("Use Diffuse Ramp"), N_("Toggle diffuse ramp operations")); + RNA_def_property_ui_text(prop, "Use Diffuse Ramp", "Toggle diffuse ramp operations"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_ramp", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "ramp_col"); RNA_def_property_struct_type(prop, "ColorRamp"); - RNA_def_property_ui_text(prop, N_("Diffuse Ramp"), N_("Color ramp used to affect diffuse shading")); + RNA_def_property_ui_text(prop, "Diffuse Ramp", "Color ramp used to affect diffuse shading"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_specular_ramp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAMP_SPEC); RNA_def_property_boolean_funcs(prop, NULL, "rna_Material_use_specular_ramp_set"); - RNA_def_property_ui_text(prop, N_("Use Specular Ramp"), N_("Toggle specular ramp operations")); + RNA_def_property_ui_text(prop, "Use Specular Ramp", "Toggle specular ramp operations"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_ramp", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "ramp_spec"); RNA_def_property_struct_type(prop, "ColorRamp"); - RNA_def_property_ui_text(prop, N_("Specular Ramp"), N_("Color ramp used to affect specular shading")); + RNA_def_property_ui_text(prop, "Specular Ramp", "Color ramp used to affect specular shading"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_ramp_blend", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rampblend_col"); RNA_def_property_enum_items(prop, ramp_blend_items); - RNA_def_property_ui_text(prop, N_("Diffuse Ramp Blend"), N_("Blending method of the ramp and the diffuse color")); + RNA_def_property_ui_text(prop, "Diffuse Ramp Blend", "Blending method of the ramp and the diffuse color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_ramp_blend", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rampblend_spec"); RNA_def_property_enum_items(prop, ramp_blend_items); - RNA_def_property_ui_text(prop, N_("Diffuse Ramp Blend"), N_("Blending method of the ramp and the specular color")); + RNA_def_property_ui_text(prop, "Diffuse Ramp Blend", "Blending method of the ramp and the specular color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_ramp_input", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rampin_col"); RNA_def_property_enum_items(prop, prop_ramp_input_items); - RNA_def_property_ui_text(prop, N_("Diffuse Ramp Input"), N_("Determines how the ramp maps on the surface")); + RNA_def_property_ui_text(prop, "Diffuse Ramp Input", "Determines how the ramp maps on the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_ramp_input", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rampin_spec"); RNA_def_property_enum_items(prop, prop_ramp_input_items); - RNA_def_property_ui_text(prop, N_("Specular Ramp Input"), N_("Determines how the ramp maps on the surface")); + RNA_def_property_ui_text(prop, "Specular Ramp Input", "Determines how the ramp maps on the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_ramp_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "rampfac_col"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Diffuse Ramp Factor"), N_("Blending factor (also uses alpha in Colorband)")); + RNA_def_property_ui_text(prop, "Diffuse Ramp Factor", "Blending factor (also uses alpha in Colorband)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_ramp_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "rampfac_spec"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Specular Ramp Factor"), N_("Blending factor (also uses alpha in Colorband)")); + RNA_def_property_ui_text(prop, "Specular Ramp Factor", "Blending factor (also uses alpha in Colorband)"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -845,57 +843,57 @@ static void rna_def_material_diffuse(StructRNA *srna) PropertyRNA *prop; static EnumPropertyItem prop_diff_shader_items[] = { - {MA_DIFF_LAMBERT, "LAMBERT", 0, N_("Lambert"), N_("Use a Lambertian shader")}, - {MA_DIFF_ORENNAYAR, "OREN_NAYAR", 0, N_("Oren-Nayar"), N_("Use an Oren-Nayar shader")}, - {MA_DIFF_TOON, "TOON", 0, N_("Toon"), N_("Use a toon shader")}, - {MA_DIFF_MINNAERT, "MINNAERT", 0, N_("Minnaert"), N_("Use a Minnaert shader")}, - {MA_DIFF_FRESNEL, "FRESNEL", 0, N_("Fresnel"), N_("Use a Fresnel shader")}, + {MA_DIFF_LAMBERT, "LAMBERT", 0, "Lambert", "Use a Lambertian shader"}, + {MA_DIFF_ORENNAYAR, "OREN_NAYAR", 0, "Oren-Nayar", "Use an Oren-Nayar shader"}, + {MA_DIFF_TOON, "TOON", 0, "Toon", "Use a toon shader"}, + {MA_DIFF_MINNAERT, "MINNAERT", 0, "Minnaert", "Use a Minnaert shader"}, + {MA_DIFF_FRESNEL, "FRESNEL", 0, "Fresnel", "Use a Fresnel shader"}, {0, NULL, 0, NULL, NULL}}; prop= RNA_def_property(srna, "diffuse_shader", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "diff_shader"); RNA_def_property_enum_items(prop, prop_diff_shader_items); - RNA_def_property_ui_text(prop, N_("Diffuse Shader Model"), ""); + RNA_def_property_ui_text(prop, "Diffuse Shader Model", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_intensity", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "ref"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Diffuse Intensity"), N_("Amount of diffuse reflection")); + RNA_def_property_ui_text(prop, "Diffuse Intensity", "Amount of diffuse reflection"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "roughness", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.0f, 3.14f); - RNA_def_property_ui_text(prop, N_("Roughness"), N_("Oren-Nayar Roughness")); + RNA_def_property_ui_text(prop, "Roughness", "Oren-Nayar Roughness"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_toon_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "param[0]"); RNA_def_property_range(prop, 0.0f, 3.14f); - RNA_def_property_ui_text(prop, N_("Diffuse Toon Size"), N_("Size of diffuse toon area")); + RNA_def_property_ui_text(prop, "Diffuse Toon Size", "Size of diffuse toon area"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_toon_smooth", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "param[1]"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Diffuse Toon Smooth"), N_("Smoothness of diffuse toon area")); + RNA_def_property_ui_text(prop, "Diffuse Toon Smooth", "Smoothness of diffuse toon area"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_fresnel", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "param[1]"); RNA_def_property_range(prop, 0.0f, 5.0f); - RNA_def_property_ui_text(prop, N_("Diffuse Fresnel"), N_("Power of Fresnel")); + RNA_def_property_ui_text(prop, "Diffuse Fresnel", "Power of Fresnel"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "diffuse_fresnel_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "param[0]"); RNA_def_property_range(prop, 0.0f, 5.0f); - RNA_def_property_ui_text(prop, N_("Diffuse Fresnel Factor"), N_("Blending factor of Fresnel")); + RNA_def_property_ui_text(prop, "Diffuse Fresnel Factor", "Blending factor of Fresnel"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "darkness", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.0f, 2.0f); - RNA_def_property_ui_text(prop, N_("Darkness"), N_("Minnaert darkness")); + RNA_def_property_ui_text(prop, "Darkness", "Minnaert darkness"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -905,78 +903,78 @@ static void rna_def_material_raymirror(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_fadeto_mir_items[] = { - {MA_RAYMIR_FADETOSKY, "FADE_TO_SKY", 0, N_("Sky"), ""}, - {MA_RAYMIR_FADETOMAT, "FADE_TO_MATERIAL", 0, N_("Material"), ""}, + {MA_RAYMIR_FADETOSKY, "FADE_TO_SKY", 0, "Sky", ""}, + {MA_RAYMIR_FADETOMAT, "FADE_TO_MATERIAL", 0, "Material", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "MaterialRaytraceMirror", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Raytrace Mirror"), N_("Raytraced reflection settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Raytrace Mirror", "Raytraced reflection settings for a Material datablock"); prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAYMIRROR); /* use bitflags */ - RNA_def_property_ui_text(prop, N_("Enabled"), N_("Enable raytraced reflections")); + RNA_def_property_ui_text(prop, "Enabled", "Enable raytraced reflections"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "reflect_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "ray_mirror"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Reflectivity"), N_("Sets the amount mirror reflection for raytrace")); + RNA_def_property_ui_text(prop, "Reflectivity", "Sets the amount mirror reflection for raytrace"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "fresnel", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fresnel_mir"); RNA_def_property_range(prop, 0.0f, 5.0f); - RNA_def_property_ui_text(prop, N_("Fresnel"), N_("Power of Fresnel for mirror reflection")); + RNA_def_property_ui_text(prop, "Fresnel", "Power of Fresnel for mirror reflection"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "fresnel_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "fresnel_mir_i"); RNA_def_property_range(prop, 0.0f, 5.0f); - RNA_def_property_ui_text(prop, N_("Fresnel Factor"), N_("Blending factor for Fresnel")); + RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "gloss_mir"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Gloss Amount"), N_("The shininess of the reflection. Values < 1.0 give diffuse, blurry reflections")); + RNA_def_property_ui_text(prop, "Gloss Amount", "The shininess of the reflection. Values < 1.0 give diffuse, blurry reflections"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_anisotropic", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "aniso_gloss_mir"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Gloss Anisotropy"), N_("The shape of the reflection, from 0.0 (circular) to 1.0 (fully stretched along the tangent")); + RNA_def_property_ui_text(prop, "Gloss Anisotropy", "The shape of the reflection, from 0.0 (circular) to 1.0 (fully stretched along the tangent"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_samples", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "samp_gloss_mir"); RNA_def_property_range(prop, 0, 1024); - RNA_def_property_ui_text(prop, N_("Gloss Samples"), N_("Number of cone samples averaged for blurry reflections")); + RNA_def_property_ui_text(prop, "Gloss Samples", "Number of cone samples averaged for blurry reflections"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_threshold", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "adapt_thresh_mir"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Gloss Threshold"), N_("Threshold for adaptive sampling. If a sample contributes less than this amount (as a percentage), sampling is stopped")); + RNA_def_property_ui_text(prop, "Gloss Threshold", "Threshold for adaptive sampling. If a sample contributes less than this amount (as a percentage), sampling is stopped"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "depth", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "ray_depth"); RNA_def_property_ui_range(prop, 0, 100, 1, 3); - RNA_def_property_ui_text(prop, N_("Depth"), N_("Maximum allowed number of light inter-reflections")); + RNA_def_property_ui_text(prop, "Depth", "Maximum allowed number of light inter-reflections"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "dist_mir"); RNA_def_property_range(prop, 0.0f, 10000.0f); - RNA_def_property_ui_text(prop, N_("Maximum Distance"), N_("Maximum distance of reflected rays. Reflections further than this range fade to sky color or material color")); + RNA_def_property_ui_text(prop, "Maximum Distance", "Maximum distance of reflected rays. Reflections further than this range fade to sky color or material color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "fade_to", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "fadeto_mir"); RNA_def_property_enum_items(prop, prop_fadeto_mir_items); - RNA_def_property_ui_text(prop, N_("Fade-out Color"), N_("The color that rays with no intersection within the Max Distance take. Material color can be best for indoor scenes, sky color for outdoor")); + RNA_def_property_ui_text(prop, "Fade-out Color", "The color that rays with no intersection within the Max Distance take. Material color can be best for indoor scenes, sky color for outdoor"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -988,66 +986,66 @@ static void rna_def_material_raytra(BlenderRNA *brna) srna= RNA_def_struct(brna, "MaterialRaytraceTransparency", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Raytrace Transparency"), N_("Raytraced refraction settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Raytrace Transparency", "Raytraced refraction settings for a Material datablock"); prop= RNA_def_property(srna, "ior", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ang"); RNA_def_property_range(prop, 0.25f, 4.0f); - RNA_def_property_ui_text(prop, "IOR", N_("Sets angular index of refraction for raytraced refraction")); + RNA_def_property_ui_text(prop, "IOR", "Sets angular index of refraction for raytraced refraction"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "fresnel", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fresnel_tra"); RNA_def_property_range(prop, 0.0f, 5.0f); - RNA_def_property_ui_text(prop, N_("Fresnel"), N_("Power of Fresnel for transparency (Ray or ZTransp)")); + RNA_def_property_ui_text(prop, "Fresnel", "Power of Fresnel for transparency (Ray or ZTransp)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "fresnel_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "fresnel_tra_i"); RNA_def_property_range(prop, 1.0f, 5.0f); - RNA_def_property_ui_text(prop, N_("Fresnel Factor"), N_("Blending factor for Fresnel")); + RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "gloss_tra"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Gloss Amount"), N_("The clarity of the refraction. Values < 1.0 give diffuse, blurry refractions")); + RNA_def_property_ui_text(prop, "Gloss Amount", "The clarity of the refraction. Values < 1.0 give diffuse, blurry refractions"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_samples", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "samp_gloss_tra"); RNA_def_property_range(prop, 0, 1024); - RNA_def_property_ui_text(prop, N_("Gloss Samples"), N_("Number of cone samples averaged for blurry refractions")); + RNA_def_property_ui_text(prop, "Gloss Samples", "Number of cone samples averaged for blurry refractions"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "gloss_threshold", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "adapt_thresh_tra"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Gloss Threshold"), N_("Threshold for adaptive sampling. If a sample contributes less than this amount (as a percentage), sampling is stopped")); + RNA_def_property_ui_text(prop, "Gloss Threshold", "Threshold for adaptive sampling. If a sample contributes less than this amount (as a percentage), sampling is stopped"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "depth", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "ray_depth_tra"); RNA_def_property_ui_range(prop, 0, 100, 1, 3); - RNA_def_property_ui_text(prop, N_("Depth"), N_("Maximum allowed number of light inter-refractions")); + RNA_def_property_ui_text(prop, "Depth", "Maximum allowed number of light inter-refractions"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "filter", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "filter"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Filter"), N_("Amount to blend in the material's diffuse color in raytraced transparency (simulating absorption)")); + RNA_def_property_ui_text(prop, "Filter", "Amount to blend in the material's diffuse color in raytraced transparency (simulating absorption)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "depth_max", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "tx_limit"); RNA_def_property_range(prop, 0.0f, 100.0f); - RNA_def_property_ui_text(prop, N_("Limit"), N_("Maximum depth for light to travel through the transparent material before becoming fully filtered (0.0 is disabled)")); + RNA_def_property_ui_text(prop, "Limit", "Maximum depth for light to travel through the transparent material before becoming fully filtered (0.0 is disabled)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "tx_falloff"); RNA_def_property_range(prop, 0.1f, 10.0f); - RNA_def_property_ui_text(prop, N_("Falloff"), N_("Falloff power for transmissivity filter effect (1.0 is linear)")); + RNA_def_property_ui_text(prop, "Falloff", "Falloff power for transmissivity filter effect (1.0 is linear)"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -1057,140 +1055,140 @@ static void rna_def_material_volume(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_lighting_items[] = { - {MA_VOL_SHADE_SHADELESS, "SHADELESS", 0, N_("Shadeless"), N_("Do not calculate lighting and shadows")}, - {MA_VOL_SHADE_SHADOWED, "SHADOWED", 0, N_("Shadowed"), ""}, - {MA_VOL_SHADE_SHADED, "SHADED", 0, N_("Shaded"), ""}, - {MA_VOL_SHADE_MULTIPLE, "MULTIPLE_SCATTERING", 0, N_("Multiple Scattering"), ""}, - {MA_VOL_SHADE_SHADEDPLUSMULTIPLE, "SHADED_PLUS_MULTIPLE_SCATTERING", 0, N_("Shaded + Multiple Scattering"), ""}, + {MA_VOL_SHADE_SHADELESS, "SHADELESS", 0, "Shadeless", "Do not calculate lighting and shadows"}, + {MA_VOL_SHADE_SHADOWED, "SHADOWED", 0, "Shadowed", ""}, + {MA_VOL_SHADE_SHADED, "SHADED", 0, "Shaded", ""}, + {MA_VOL_SHADE_MULTIPLE, "MULTIPLE_SCATTERING", 0, "Multiple Scattering", ""}, + {MA_VOL_SHADE_SHADEDPLUSMULTIPLE, "SHADED_PLUS_MULTIPLE_SCATTERING", 0, "Shaded + Multiple Scattering", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_stepsize_items[] = { - {MA_VOL_STEP_RANDOMIZED, "RANDOMIZED", 0, N_("Randomized"), ""}, - {MA_VOL_STEP_CONSTANT, "CONSTANT", 0, N_("Constant"), ""}, + {MA_VOL_STEP_RANDOMIZED, "RANDOMIZED", 0, "Randomized", ""}, + {MA_VOL_STEP_CONSTANT, "CONSTANT", 0, "Constant", ""}, //{MA_VOL_STEP_ADAPTIVE, "ADAPTIVE", 0, "Adaptive", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "MaterialVolume", NULL); RNA_def_struct_sdna(srna, "VolumeSettings"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Volume"), N_("Volume rendering settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Volume", "Volume rendering settings for a Material datablock"); prop= RNA_def_property(srna, "step_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stepsize_type"); RNA_def_property_enum_items(prop, prop_stepsize_items); - RNA_def_property_ui_text(prop, N_("Step Calculation"), N_("Method of calculating the steps through the volume")); + RNA_def_property_ui_text(prop, "Step Calculation", "Method of calculating the steps through the volume"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "step_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "stepsize"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, 1.0f, 1, 3); - RNA_def_property_ui_text(prop, N_("Step Size"), N_("Distance between subsequent volume depth samples")); + RNA_def_property_ui_text(prop, "Step Size", "Distance between subsequent volume depth samples"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "light_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "shade_type"); RNA_def_property_enum_items(prop, prop_lighting_items); - RNA_def_property_ui_text(prop, N_("Lighting Mode"), N_("Method of shading, attenuating, and scattering light through the volume")); + RNA_def_property_ui_text(prop, "Lighting Mode", "Method of shading, attenuating, and scattering light through the volume"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_external_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shadeflag", MA_VOL_RECV_EXT_SHADOW); /* use bitflags */ - RNA_def_property_ui_text(prop, N_("External Shadows"), N_("Receive shadows from sources outside the volume (temporary)")); + RNA_def_property_ui_text(prop, "External Shadows", "Receive shadows from sources outside the volume (temporary)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_light_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shadeflag", MA_VOL_PRECACHESHADING); /* use bitflags */ - RNA_def_property_ui_text(prop, N_("Light Cache"), N_("Pre-calculate the shading information into a voxel grid, speeds up shading at slightly less accuracy")); + RNA_def_property_ui_text(prop, "Light Cache", "Pre-calculate the shading information into a voxel grid, speeds up shading at slightly less accuracy"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "cache_resolution", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "precache_resolution"); RNA_def_property_range(prop, 1, 1024); - RNA_def_property_ui_text(prop, N_("Resolution"), N_("Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory")); + RNA_def_property_ui_text(prop, "Resolution", "Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ms_diffusion", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ms_diff"); RNA_def_property_range(prop, 0.0f, FLT_MAX); - RNA_def_property_ui_text(prop, N_("Diffusion"), N_("Diffusion factor, the strength of the blurring effect")); + RNA_def_property_ui_text(prop, "Diffusion", "Diffusion factor, the strength of the blurring effect"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ms_spread", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ms_spread"); RNA_def_property_range(prop, 0, FLT_MAX); RNA_def_property_ui_range(prop, 0.0f, 1.0f, 1, 3); - RNA_def_property_ui_text(prop, N_("Spread"), N_("Proportional distance over which the light is diffused")); + RNA_def_property_ui_text(prop, "Spread", "Proportional distance over which the light is diffused"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ms_intensity", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ms_intensity"); RNA_def_property_range(prop, 0.0f, FLT_MAX); - RNA_def_property_ui_text(prop, N_("Intensity"), N_("Multiplier for multiple scattered light energy")); + RNA_def_property_ui_text(prop, "Intensity", "Multiplier for multiple scattered light energy"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "depth_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "depth_cutoff"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Depth Cutoff"), N_("Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy")); + RNA_def_property_ui_text(prop, "Depth Cutoff", "Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "density", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "density"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Density"), N_("The base density of the volume")); + RNA_def_property_ui_text(prop, "Density", "The base density of the volume"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "density_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "density_scale"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); - RNA_def_property_ui_text(prop, N_("Density Scale"), N_("Multiplier for the material's density")); + RNA_def_property_ui_text(prop, "Density Scale", "Multiplier for the material's density"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "scattering", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "scattering"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1 ,3); - RNA_def_property_ui_text(prop, N_("Scattering"), N_("Amount of light that gets scattered out by the volume - the more out-scattering, the shallower the light will penetrate ")); + RNA_def_property_ui_text(prop, "Scattering", "Amount of light that gets scattered out by the volume - the more out-scattering, the shallower the light will penetrate "); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "transmission_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "transmission_col"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Transmission Color"), N_("Result color of the volume, after other light has been scattered/absorbed")); + RNA_def_property_ui_text(prop, "Transmission Color", "Result color of the volume, after other light has been scattered/absorbed"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "reflection_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "reflection_col"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Reflection Color"), N_("Color of light scattered out of the volume (does not affect transmission)")); + RNA_def_property_ui_text(prop, "Reflection Color", "Color of light scattered out of the volume (does not affect transmission)"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "reflection", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "reflection"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.0f, 100.0f, 1 ,3); - RNA_def_property_ui_text(prop, N_("Reflection"), N_("Multiplier to make out-scattered light brighter or darker (non-physically correct)")); + RNA_def_property_ui_text(prop, "Reflection", "Multiplier to make out-scattered light brighter or darker (non-physically correct)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "emission_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "emission_col"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Emission Color"), N_("Color of emitted light")); + RNA_def_property_ui_text(prop, "Emission Color", "Color of emitted light"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "emission", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "emission"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); - RNA_def_property_ui_text(prop, N_("Emission"), N_("Amount of light that gets emitted by the volume")); + RNA_def_property_ui_text(prop, "Emission", "Amount of light that gets emitted by the volume"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "asymmetry", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "asymmetry"); RNA_def_property_range(prop, -1.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Asymmetry"), N_("Back scattering (-1.0) to Forward scattering (1.0) and the range in between")); + RNA_def_property_ui_text(prop, "Asymmetry", "Back scattering (-1.0) to Forward scattering (1.0) and the range in between"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -1203,123 +1201,123 @@ static void rna_def_material_halo(BlenderRNA *brna) srna= RNA_def_struct(brna, "MaterialHalo", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Halo"), N_("Halo particle effect settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Halo", "Halo particle effect settings for a Material datablock"); prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "hasize"); RNA_def_property_range(prop, 0.0f, 100.0f); - RNA_def_property_ui_text(prop, N_("Size"), N_("Sets the dimension of the halo")); + RNA_def_property_ui_text(prop, "Size", "Sets the dimension of the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "hardness", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "har"); RNA_def_property_range(prop, 0, 127); - RNA_def_property_ui_text(prop, N_("Hardness"), N_("Sets the hardness of the halo")); + RNA_def_property_ui_text(prop, "Hardness", "Sets the hardness of the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "add", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "add"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Add"), N_("Sets the strength of the add effect")); + RNA_def_property_ui_text(prop, "Add", "Sets the strength of the add effect"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ring_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ringc"); RNA_def_property_range(prop, 0, 24); - RNA_def_property_ui_text(prop, N_("Rings"), N_("Sets the number of rings rendered over the halo")); + RNA_def_property_ui_text(prop, "Rings", "Sets the number of rings rendered over the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "line_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "linec"); RNA_def_property_range(prop, 0, 250); - RNA_def_property_ui_text(prop, N_("Line Number"), N_("Sets the number of star shaped lines rendered over the halo")); + RNA_def_property_ui_text(prop, "Line Number", "Sets the number of star shaped lines rendered over the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "star_tip_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "starc"); RNA_def_property_range(prop, 3, 50); - RNA_def_property_ui_text(prop, N_("Star Tips"), N_("Sets the number of points on the star shaped halo")); + RNA_def_property_ui_text(prop, "Star Tips", "Sets the number of points on the star shaped halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "seed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "seed1"); RNA_def_property_range(prop, 0, 255); - RNA_def_property_ui_text(prop, N_("Seed"), N_("Randomizes ring dimension and line location")); + RNA_def_property_ui_text(prop, "Seed", "Randomizes ring dimension and line location"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_flare_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_FLARE); /* use bitflags */ - RNA_def_property_ui_text(prop, N_("Flare"), N_("Renders halo as a lens flare")); + RNA_def_property_ui_text(prop, "Flare", "Renders halo as a lens flare"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "flare_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "flaresize"); RNA_def_property_range(prop, 0.1f, 25.0f); - RNA_def_property_ui_text(prop, N_("Flare Size"), N_("Sets the factor by which the flare is larger than the halo")); + RNA_def_property_ui_text(prop, "Flare Size", "Sets the factor by which the flare is larger than the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "flare_subflare_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "subsize"); RNA_def_property_range(prop, 0.1f, 25.0f); - RNA_def_property_ui_text(prop, N_("Flare Subsize"), N_("Sets the dimension of the sub-flares, dots and circles")); + RNA_def_property_ui_text(prop, "Flare Subsize", "Sets the dimension of the sub-flares, dots and circles"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "flare_boost", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "flareboost"); RNA_def_property_range(prop, 0.1f, 10.0f); - RNA_def_property_ui_text(prop, N_("Flare Boost"), N_("Gives the flare extra strength")); + RNA_def_property_ui_text(prop, "Flare Boost", "Gives the flare extra strength"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "flare_seed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "seed2"); RNA_def_property_range(prop, 0, 255); - RNA_def_property_ui_text(prop, N_("Flare Seed"), N_("Specifies an offset in the flare seed table")); + RNA_def_property_ui_text(prop, "Flare Seed", "Specifies an offset in the flare seed table"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "flare_subflare_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "flarec"); RNA_def_property_range(prop, 1, 32); - RNA_def_property_ui_text(prop, N_("Flares Sub"), N_("Sets the number of sub-flares")); + RNA_def_property_ui_text(prop, "Flares Sub", "Sets the number of sub-flares"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_ring", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_RINGS); - RNA_def_property_ui_text(prop, N_("Rings"), N_("Renders rings over halo")); + RNA_def_property_ui_text(prop, "Rings", "Renders rings over halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_lines", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_LINES); - RNA_def_property_ui_text(prop, N_("Lines"), N_("Renders star shaped lines over halo")); + RNA_def_property_ui_text(prop, "Lines", "Renders star shaped lines over halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_star", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_STAR); - RNA_def_property_ui_text(prop, N_("Star"), N_("Renders halo as a star")); + RNA_def_property_ui_text(prop, "Star", "Renders halo as a star"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALOTEX); - RNA_def_property_ui_text(prop, N_("Texture"), N_("Gives halo a texture")); + RNA_def_property_ui_text(prop, "Texture", "Gives halo a texture"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_vertex_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALOPUNO); - RNA_def_property_ui_text(prop, N_("Vertex Normal"), N_("Uses the vertex normal to specify the dimension of the halo")); + RNA_def_property_ui_text(prop, "Vertex Normal", "Uses the vertex normal to specify the dimension of the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_extreme_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_XALPHA); - RNA_def_property_ui_text(prop, N_("Extreme Alpha"), N_("Uses extreme alpha")); + RNA_def_property_ui_text(prop, "Extreme Alpha", "Uses extreme alpha"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_shaded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_SHADE); - RNA_def_property_ui_text(prop, N_("Shaded"), N_("Lets halo receive light and shadows from external objects")); + RNA_def_property_ui_text(prop, "Shaded", "Lets halo receive light and shadows from external objects"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_soft", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_SOFT); - RNA_def_property_ui_text(prop, N_("Soft"), N_("Softens the edges of halos at intersections with other geometry")); + RNA_def_property_ui_text(prop, "Soft", "Softens the edges of halos at intersections with other geometry"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -1331,65 +1329,65 @@ static void rna_def_material_sss(BlenderRNA *brna) srna= RNA_def_struct(brna, "MaterialSubsurfaceScattering", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Subsurface Scattering"), N_("Diffuse subsurface scattering settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Subsurface Scattering", "Diffuse subsurface scattering settings for a Material datablock"); prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_COLOR|PROP_UNIT_LENGTH); RNA_def_property_float_sdna(prop, NULL, "sss_radius"); RNA_def_property_range(prop, 0.001, FLT_MAX); RNA_def_property_ui_range(prop, 0.001, 10000, 1, 3); - RNA_def_property_ui_text(prop, N_("Radius"), N_("Mean red/green/blue scattering path length")); + RNA_def_property_ui_text(prop, "Radius", "Mean red/green/blue scattering path length"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "sss_col"); - RNA_def_property_ui_text(prop, N_("Color"), N_("Scattering color")); + RNA_def_property_ui_text(prop, "Color", "Scattering color"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "error_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sss_error"); RNA_def_property_ui_range(prop, 0.0001, 10, 1, 3); - RNA_def_property_ui_text(prop, N_("Error Tolerance"), N_("Error tolerance (low values are slower and higher quality)")); + RNA_def_property_ui_text(prop, "Error Tolerance", "Error tolerance (low values are slower and higher quality)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sss_scale"); RNA_def_property_ui_range(prop, 0.001, 1000, 1, 3); - RNA_def_property_ui_text(prop, N_("Scale"), N_("Object scale factor")); + RNA_def_property_ui_text(prop, "Scale", "Object scale factor"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ior", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sss_ior"); RNA_def_property_ui_range(prop, 0.1, 2, 1, 3); - RNA_def_property_ui_text(prop, "IOR", N_("Index of refraction (higher values are denser)")); + RNA_def_property_ui_text(prop, "IOR", "Index of refraction (higher values are denser)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "color_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "sss_colfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Color Factor"), N_("Blend factor for SSS colors")); + RNA_def_property_ui_text(prop, "Color Factor", "Blend factor for SSS colors"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "texture_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "sss_texfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, N_("Texture Factor"), N_("Texture scatting blend factor")); + RNA_def_property_ui_text(prop, "Texture Factor", "Texture scatting blend factor"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "front", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sss_front"); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, N_("Front"), N_("Front scattering weight")); + RNA_def_property_ui_text(prop, "Front", "Front scattering weight"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "back", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sss_back"); RNA_def_property_range(prop, 0, 10); - RNA_def_property_ui_text(prop, N_("Back"), N_("Back scattering weight")); + RNA_def_property_ui_text(prop, "Back", "Back scattering weight"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "sss_flag", MA_DIFF_SSS); - RNA_def_property_ui_text(prop, N_("Enabled"), N_("Enable diffuse subsurface scatting effects in a material")); + RNA_def_property_ui_text(prop, "Enabled", "Enable diffuse subsurface scatting effects in a material"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -1398,23 +1396,23 @@ static void rna_def_material_specularity(StructRNA *srna) PropertyRNA *prop; static EnumPropertyItem prop_specular_shader_items[] = { - {MA_SPEC_COOKTORR, "COOKTORR", 0, N_("CookTorr"), N_("Use a Cook-Torrance shader")}, - {MA_SPEC_PHONG, "PHONG", 0, N_("Phong"), N_("Use a Phong shader")}, - {MA_SPEC_BLINN, "BLINN", 0, N_("Blinn"), N_("Use a Blinn shader")}, - {MA_SPEC_TOON, "TOON", 0, N_("Toon"), N_("Use a toon shader")}, - {MA_SPEC_WARDISO, "WARDISO", 0, N_("WardIso"), N_("Use a Ward anisotropic shader")}, + {MA_SPEC_COOKTORR, "COOKTORR", 0, "CookTorr", "Use a Cook-Torrance shader"}, + {MA_SPEC_PHONG, "PHONG", 0, "Phong", "Use a Phong shader"}, + {MA_SPEC_BLINN, "BLINN", 0, "Blinn", "Use a Blinn shader"}, + {MA_SPEC_TOON, "TOON", 0, "Toon", "Use a toon shader"}, + {MA_SPEC_WARDISO, "WARDISO", 0, "WardIso", "Use a Ward anisotropic shader"}, {0, NULL, 0, NULL, NULL}}; prop= RNA_def_property(srna, "specular_shader", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "spec_shader"); RNA_def_property_enum_items(prop, prop_specular_shader_items); - RNA_def_property_ui_text(prop, N_("Specular Shader Model"), ""); + RNA_def_property_ui_text(prop, "Specular Shader Model", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_intensity", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "spec"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Specular Intensity"), N_("How intense (bright) the specular reflection is")); + RNA_def_property_ui_text(prop, "Specular Intensity", "How intense (bright) the specular reflection is"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); /* NOTE: "har", "param", etc are used for multiple purposes depending on @@ -1425,31 +1423,31 @@ static void rna_def_material_specularity(StructRNA *srna) prop= RNA_def_property(srna, "specular_hardness", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "har"); RNA_def_property_range(prop, 1, 511); - RNA_def_property_ui_text(prop, N_("Specular Hardness"), N_("How hard (sharp) the specular reflection is")); + RNA_def_property_ui_text(prop, "Specular Hardness", "How hard (sharp) the specular reflection is"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "specular_ior", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "refrac"); RNA_def_property_range(prop, 1, 10); - RNA_def_property_ui_text(prop, N_("Specular IOR"), N_("Specular index of refraction")); + RNA_def_property_ui_text(prop, "Specular IOR", "Specular index of refraction"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_toon_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "param[2]"); RNA_def_property_range(prop, 0.0f, 1.53f); - RNA_def_property_ui_text(prop, N_("Specular Toon Size"), N_("Size of specular toon area")); + RNA_def_property_ui_text(prop, "Specular Toon Size", "Size of specular toon area"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_toon_smooth", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "param[3]"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Specular Toon Smooth"), N_("Smoothness of specular toon area")); + RNA_def_property_ui_text(prop, "Specular Toon Smooth", "Smoothness of specular toon area"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "specular_slope", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "rms"); RNA_def_property_range(prop, 0, 0.4); - RNA_def_property_ui_text(prop, N_("Specular Slope"), N_("The standard deviation of surface slope")); + RNA_def_property_ui_text(prop, "Specular Slope", "The standard deviation of surface slope"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -1461,66 +1459,66 @@ static void rna_def_material_strand(BlenderRNA *brna) srna= RNA_def_struct(brna, "MaterialStrand", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Strand"), N_("Strand settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Strand", "Strand settings for a Material datablock"); prop= RNA_def_property(srna, "use_tangent_shading", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TANGENT_STR); - RNA_def_property_ui_text(prop, N_("Tangent Shading"), N_("Uses direction of strands as normal for tangent-shading")); + RNA_def_property_ui_text(prop, "Tangent Shading", "Uses direction of strands as normal for tangent-shading"); RNA_def_property_update(prop, 0, "rna_Material_update"); /* this flag is only set when rendering, not to be edited manually */ prop= RNA_def_property(srna, "use_surface_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_STR_SURFDIFF); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Surface Diffuse"), N_("Make diffuse shading more similar to shading the surface")); + RNA_def_property_ui_text(prop, "Surface Diffuse", "Make diffuse shading more similar to shading the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "blend_distance", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "strand_surfnor"); RNA_def_property_range(prop, 0, 10); - RNA_def_property_ui_text(prop, N_("Blend Distance"), N_("Worldspace distance over which to blend in the surface normal")); + RNA_def_property_ui_text(prop, "Blend Distance", "Worldspace distance over which to blend in the surface normal"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_blender_units", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_STR_B_UNITS); - RNA_def_property_ui_text(prop, N_("Blender Units"), N_("Use Blender units for widths instead of pixels")); + RNA_def_property_ui_text(prop, "Blender Units", "Use Blender units for widths instead of pixels"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "root_size", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "strand_sta"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_MaterialStrand_start_size_range"); RNA_def_property_ui_range(prop, 0, 10.0f, 10, 5); - RNA_def_property_ui_text(prop, N_("Root Size"), N_("Start size of strands in pixels or Blender units")); + RNA_def_property_ui_text(prop, "Root Size", "Start size of strands in pixels or Blender units"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "tip_size", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "strand_end"); RNA_def_property_ui_range(prop, 0, 10.0f, 10, 5); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_MaterialStrand_end_size_range"); - RNA_def_property_ui_text(prop, N_("Tip Size"), N_("End size of strands in pixels or Blender units")); + RNA_def_property_ui_text(prop, "Tip Size", "End size of strands in pixels or Blender units"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "size_min", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "strand_min"); RNA_def_property_range(prop, 0.001, 10); - RNA_def_property_ui_text(prop, N_("Minimum Size"), N_("Minimum size of strands in pixels")); + RNA_def_property_ui_text(prop, "Minimum Size", "Minimum size of strands in pixels"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "shape", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "strand_ease"); RNA_def_property_range(prop, -0.9, 0.9); - RNA_def_property_ui_text(prop, N_("Shape"), N_("Positive values make strands rounder, negative makes strands spiky")); + RNA_def_property_ui_text(prop, "Shape", "Positive values make strands rounder, negative makes strands spiky"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "width_fade", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "strand_widthfade"); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, N_("Width Fade"), N_("Transparency along the width of the strand")); + RNA_def_property_ui_text(prop, "Width Fade", "Transparency along the width of the strand"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "strand_uvname"); - RNA_def_property_ui_text(prop, N_("UV Layer"), N_("Name of UV layer to override")); + RNA_def_property_ui_text(prop, "UV Layer", "Name of UV layer to override"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -1532,38 +1530,38 @@ static void rna_def_material_physics(BlenderRNA *brna) srna= RNA_def_struct(brna, "MaterialPhysics", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, N_("Material Physics"), N_("Physics settings for a Material datablock")); + RNA_def_struct_ui_text(srna, "Material Physics", "Physics settings for a Material datablock"); prop= RNA_def_property(srna, "friction", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "friction"); RNA_def_property_range(prop, 0, 100); - RNA_def_property_ui_text(prop, N_("Friction"), N_("Coulomb friction coefficient, when inside the physics distance area")); + RNA_def_property_ui_text(prop, "Friction", "Coulomb friction coefficient, when inside the physics distance area"); prop= RNA_def_property(srna, "elasticity", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "reflect"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Elasticity"), N_("Elasticity of collisions")); + RNA_def_property_ui_text(prop, "Elasticity", "Elasticity of collisions"); /* FH/Force Field Settings */ prop= RNA_def_property(srna, "use_fh_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dynamode", MA_FH_NOR); - RNA_def_property_ui_text(prop, N_("Align to Normal"), N_("Align dynamic game objects along the surface normal, when inside the physics distance area")); + RNA_def_property_ui_text(prop, "Align to Normal", "Align dynamic game objects along the surface normal, when inside the physics distance area"); prop= RNA_def_property(srna, "fh_force", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fh"); RNA_def_property_range(prop, 0, 1); RNA_def_property_ui_range(prop, 0.0, 1.0, 10, 2); - RNA_def_property_ui_text(prop, N_("Force"), N_("Upward spring force, when inside the physics distance area")); + RNA_def_property_ui_text(prop, "Force", "Upward spring force, when inside the physics distance area"); prop= RNA_def_property(srna, "fh_distance", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fhdist"); RNA_def_property_range(prop, 0, 20); - RNA_def_property_ui_text(prop, N_("Distance"), N_("Distance of the physics area")); + RNA_def_property_ui_text(prop, "Distance", "Distance of the physics area"); prop= RNA_def_property(srna, "fh_damping", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "xyfrict"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Damping"), N_("Damping of the spring force, when inside the physics distance area")); + RNA_def_property_ui_text(prop, "Damping", "Damping of the spring force, when inside the physics distance area"); } void RNA_def_material(BlenderRNA *brna) @@ -1572,223 +1570,223 @@ void RNA_def_material(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_type_items[] = { - {MA_TYPE_SURFACE, "SURFACE", 0, N_("Surface"), N_("Render object as a surface")}, - {MA_TYPE_WIRE, "WIRE", 0, N_("Wire"), N_("Render the edges of faces as wires (not supported in ray tracing)")}, - {MA_TYPE_VOLUME, "VOLUME", 0, N_("Volume"), N_("Render object as a volume")}, - {MA_TYPE_HALO, "HALO", 0, N_("Halo"), N_("Render object as halo particles")}, + {MA_TYPE_SURFACE, "SURFACE", 0, "Surface", "Render object as a surface"}, + {MA_TYPE_WIRE, "WIRE", 0, "Wire", "Render the edges of faces as wires (not supported in ray tracing)"}, + {MA_TYPE_VOLUME, "VOLUME", 0, "Volume", "Render object as a volume"}, + {MA_TYPE_HALO, "HALO", 0, "Halo", "Render object as halo particles"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem transparency_items[] = { - {0, "MASK", 0, N_("Mask"), N_("Mask the background")}, - {MA_ZTRANSP, "Z_TRANSPARENCY", 0, N_("Z Transparency"), N_("Use alpha buffer for transparent faces")}, - {MA_RAYTRANSP, "RAYTRACE", 0, N_("Raytrace"), N_("Use raytracing for transparent refraction rendering")}, + {0, "MASK", 0, "Mask", "Mask the background"}, + {MA_ZTRANSP, "Z_TRANSPARENCY", 0, "Z Transparency", "Use alpha buffer for transparent faces"}, + {MA_RAYTRANSP, "RAYTRACE", 0, "Raytrace", "Use raytracing for transparent refraction rendering"}, {0, NULL, 0, NULL, NULL}}; /* Render Preview Types */ static EnumPropertyItem preview_type_items[] = { - {MA_FLAT, "FLAT", ICON_MATPLANE, N_("Flat"), N_("Preview type: Flat XY plane")}, - {MA_SPHERE, "SPHERE", ICON_MATSPHERE, N_("Sphere"), N_("Preview type: Sphere")}, - {MA_CUBE, "CUBE", ICON_MATCUBE, N_("Flat"), N_("Preview type: Cube")}, - {MA_MONKEY, "MONKEY", ICON_MONKEY, N_("Flat"), N_("Preview type: Monkey")}, - {MA_HAIR, "HAIR", ICON_HAIR, N_("Flat"), N_("Preview type: Hair strands")}, - {MA_SPHERE_A, "SPHERE_A", ICON_MAT_SPHERE_SKY, N_("Flat"), N_("Preview type: Large sphere with sky")}, + {MA_FLAT, "FLAT", ICON_MATPLANE, "Flat", "Preview type: Flat XY plane"}, + {MA_SPHERE, "SPHERE", ICON_MATSPHERE, "Sphere", "Preview type: Sphere"}, + {MA_CUBE, "CUBE", ICON_MATCUBE, "Flat", "Preview type: Cube"}, + {MA_MONKEY, "MONKEY", ICON_MONKEY, "Flat", "Preview type: Monkey"}, + {MA_HAIR, "HAIR", ICON_HAIR, "Flat", "Preview type: Hair strands"}, + {MA_SPHERE_A, "SPHERE_A", ICON_MAT_SPHERE_SKY, "Flat", "Preview type: Large sphere with sky"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_shadows_only_items[] = { - {MA_SO_OLD, "SHADOW_ONLY_OLD", 0, N_("Shadow and Distance"), N_("Old shadow only method")}, - {MA_SO_SHADOW, "SHADOW_ONLY", 0, N_("Shadow Only"), N_("Improved shadow only method")}, - {MA_SO_SHADED, "SHADOW_ONLY_SHADED", 0, N_("Shadow and Shading"), N_("Improved shadow only method which also renders lightless areas as shadows")}, + {MA_SO_OLD, "SHADOW_ONLY_OLD", 0, "Shadow and Distance", "Old shadow only method"}, + {MA_SO_SHADOW, "SHADOW_ONLY", 0, "Shadow Only", "Improved shadow only method"}, + {MA_SO_SHADED, "SHADOW_ONLY_SHADED", 0, "Shadow and Shading", "Improved shadow only method which also renders lightless areas as shadows"}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "Material", "ID"); - RNA_def_struct_ui_text(srna, N_("Material"), N_("Material datablock to defined the appearance of geometric objects for rendering")); + RNA_def_struct_ui_text(srna, "Material", "Material datablock to defined the appearance of geometric objects for rendering"); RNA_def_struct_ui_icon(srna, ICON_MATERIAL_DATA); prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "material_type"); RNA_def_property_enum_items(prop, prop_type_items); - RNA_def_property_ui_text(prop, N_("Type"), N_("Material type defining how the object is rendered")); + RNA_def_property_ui_text(prop, "Type", "Material type defining how the object is rendered"); RNA_def_property_enum_funcs(prop, NULL, "rna_Material_type_set", NULL); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "use_transparency", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TRANSP); - RNA_def_property_ui_text(prop, N_("Transparency"), N_("Render material as transparent")); + RNA_def_property_ui_text(prop, "Transparency", "Render material as transparent"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "transparency_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, transparency_items); - RNA_def_property_ui_text(prop, N_("Transparency Method"), N_("Method to use for rendering transparency")); + RNA_def_property_ui_text(prop, "Transparency Method", "Method to use for rendering transparency"); RNA_def_property_update(prop, 0, "rna_Material_update"); /* For Preview Render */ prop= RNA_def_property(srna, "preview_render_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "pr_type"); RNA_def_property_enum_items(prop, preview_type_items); - RNA_def_property_ui_text(prop, N_("Preview render type"), N_("Type of preview render")); + RNA_def_property_ui_text(prop, "Preview render type", "Type of preview render"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "ambient", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "amb"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Ambient"), N_("Amount of global ambient color the material receives")); + RNA_def_property_ui_text(prop, "Ambient", "Amount of global ambient color the material receives"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "emit", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0, FLT_MAX); RNA_def_property_ui_range(prop, 0, 2.0f, 1, 2); - RNA_def_property_ui_text(prop, N_("Emit"), N_("Amount of light to emit")); + RNA_def_property_ui_text(prop, "Emit", "Amount of light to emit"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "translucency", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, N_("Translucency"), N_("Amount of diffuse shading on the back side")); + RNA_def_property_ui_text(prop, "Translucency", "Amount of diffuse shading on the back side"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_cubic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_CUBIC); - RNA_def_property_ui_text(prop, N_("Cubic Interpolation"), N_("Use cubic interpolation for diffuse values, for smoother transitions")); + RNA_def_property_ui_text(prop, "Cubic Interpolation", "Use cubic interpolation for diffuse values, for smoother transitions"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_object_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_OBCOLOR); - RNA_def_property_ui_text(prop, N_("Object Color"), N_("Modulate the result with a per-object color")); + RNA_def_property_ui_text(prop, "Object Color", "Modulate the result with a per-object color"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "shadow_ray_bias", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sbias"); RNA_def_property_range(prop, 0, 0.25); - RNA_def_property_ui_text(prop, N_("Shadow Ray Bias"), N_("Shadow raytracing bias to prevent terminator problems on shadow boundary")); + RNA_def_property_ui_text(prop, "Shadow Ray Bias", "Shadow raytracing bias to prevent terminator problems on shadow boundary"); prop= RNA_def_property(srna, "shadow_buffer_bias", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "lbias"); RNA_def_property_range(prop, 0, 10); - RNA_def_property_ui_text(prop, N_("Shadow Buffer Bias"), N_("Factor to multiply shadow buffer bias with (0 is ignore.)")); + RNA_def_property_ui_text(prop, "Shadow Buffer Bias", "Factor to multiply shadow buffer bias with (0 is ignore.)"); prop= RNA_def_property(srna, "shadow_cast_alpha", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "shad_alpha"); RNA_def_property_range(prop, 0.001, 1); - RNA_def_property_ui_text(prop, N_("Shadow Casting Alpha"), N_("Shadow casting alpha, in use for Irregular and Deep shadow buffer")); + RNA_def_property_ui_text(prop, "Shadow Casting Alpha", "Shadow casting alpha, in use for Irregular and Deep shadow buffer"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "light_group", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "group"); RNA_def_property_struct_type(prop, "Group"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Light Group"), N_("Limit lighting to lamps in this Group")); + RNA_def_property_ui_text(prop, "Light Group", "Limit lighting to lamps in this Group"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "index"); - RNA_def_property_ui_text(prop, N_("Pass Index"), N_("Index # for the IndexMA render pass")); + RNA_def_property_ui_text(prop, "Pass Index", "Index # for the IndexMA render pass"); RNA_def_property_update(prop, NC_OBJECT, NULL); /* flags */ prop= RNA_def_property(srna, "use_light_group_exclusive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_GROUP_NOLAY); - RNA_def_property_ui_text(prop, N_("Light Group Exclusive"), N_("Material uses the light group exclusively - these lamps are excluded from other scene lighting")); + RNA_def_property_ui_text(prop, "Light Group Exclusive", "Material uses the light group exclusively - these lamps are excluded from other scene lighting"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_raytrace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TRACEBLE); - RNA_def_property_ui_text(prop, N_("Traceable"), N_("Include this material and geometry that uses it in ray tracing calculations")); + RNA_def_property_ui_text(prop, "Traceable", "Include this material and geometry that uses it in ray tracing calculations"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADOW); - RNA_def_property_ui_text(prop, N_("Shadows"), N_("Allows this material to receive shadows")); + RNA_def_property_ui_text(prop, "Shadows", "Allows this material to receive shadows"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_shadeless", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHLESS); - RNA_def_property_ui_text(prop, N_("Shadeless"), N_("Makes this material insensitive to light or shadow")); + RNA_def_property_ui_text(prop, "Shadeless", "Makes this material insensitive to light or shadow"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); prop= RNA_def_property(srna, "use_vertex_color_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_VERTEXCOL); - RNA_def_property_ui_text(prop, N_("Vertex Color Light"), N_("Add vertex colors as additional lighting")); + RNA_def_property_ui_text(prop, "Vertex Color Light", "Add vertex colors as additional lighting"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_vertex_color_paint", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_VERTEXCOLP); - RNA_def_property_ui_text(prop, N_("Vertex Color Paint"), N_("Replaces object base color with vertex colors (multiplies with 'texture face' face assigned textures)")); + RNA_def_property_ui_text(prop, "Vertex Color Paint", "Replaces object base color with vertex colors (multiplies with 'texture face' face assigned textures)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "invert_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ZINV); - RNA_def_property_ui_text(prop, N_("Invert Z Depth"), N_("Renders material's faces with an inverted Z buffer (scanline only)")); + RNA_def_property_ui_text(prop, "Invert Z Depth", "Renders material's faces with an inverted Z buffer (scanline only)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "offset_z", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "zoffs"); - RNA_def_property_ui_text(prop, N_("Z Offset"), N_("Gives faces an artificial offset in the Z buffer for Z transparency")); + RNA_def_property_ui_text(prop, "Z Offset", "Gives faces an artificial offset in the Z buffer for Z transparency"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_sky", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ENV); - RNA_def_property_ui_text(prop, N_("Sky"), N_("Renders this material with zero alpha, with sky background in place (scanline only)")); + RNA_def_property_ui_text(prop, "Sky", "Renders this material with zero alpha, with sky background in place (scanline only)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_only_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ONLYSHADOW); - RNA_def_property_ui_text(prop, N_("Only Shadow"), N_("Renders shadows as the material's alpha value, making materials transparent except for shadowed areas")); + RNA_def_property_ui_text(prop, "Only Shadow", "Renders shadows as the material's alpha value, making materials transparent except for shadowed areas"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "shadow_only_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "shadowonly_flag"); RNA_def_property_enum_items(prop, prop_shadows_only_items); - RNA_def_property_ui_text(prop, N_("Shadow Type"), N_("How to draw shadows")); + RNA_def_property_ui_text(prop, "Shadow Type", "How to draw shadows"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_face_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FACETEXTURE); - RNA_def_property_ui_text(prop, N_("Face Textures"), N_("Replaces the object's base color with color from face assigned image textures")); + RNA_def_property_ui_text(prop, "Face Textures", "Replaces the object's base color with color from face assigned image textures"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_face_texture_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FACETEXTURE_ALPHA); - RNA_def_property_ui_text(prop, N_("Face Textures Alpha"), N_("Replaces the object's base alpha value with alpha from face assigned image textures")); + RNA_def_property_ui_text(prop, "Face Textures Alpha", "Replaces the object's base alpha value with alpha from face assigned image textures"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_cast_shadows_only", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ONLYCAST); - RNA_def_property_ui_text(prop, N_("Cast Shadows Only"), N_("Makes objects with this material appear invisible, only casting shadows (not rendered)")); + RNA_def_property_ui_text(prop, "Cast Shadows Only", "Makes objects with this material appear invisible, only casting shadows (not rendered)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_mist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", MA_NOMIST); - RNA_def_property_ui_text(prop, N_("Use Mist"), N_("Use mist with this material (in world settings)")); + RNA_def_property_ui_text(prop, "Use Mist", "Use mist with this material (in world settings)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_transparent_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADOW_TRA); - RNA_def_property_ui_text(prop, N_("Receive Transparent Shadows"), N_("Allow this object to receive transparent shadows cast through other objects")); + RNA_def_property_ui_text(prop, "Receive Transparent Shadows", "Allow this object to receive transparent shadows cast through other objects"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_ray_shadow_bias", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAYBIAS); - RNA_def_property_ui_text(prop, N_("Ray Shadow Bias"), N_("Prevents raytraced shadow errors on surfaces with smooth shaded normals (terminator problem)")); + RNA_def_property_ui_text(prop, "Ray Shadow Bias", "Prevents raytraced shadow errors on surfaces with smooth shaded normals (terminator problem)"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_full_oversampling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FULL_OSA); - RNA_def_property_ui_text(prop, N_("Full Oversampling"), N_("Force this material to render full shading/textures for all anti-aliasing samples")); + RNA_def_property_ui_text(prop, "Full Oversampling", "Force this material to render full shading/textures for all anti-aliasing samples"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_cast_buffer_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADBUF); - RNA_def_property_ui_text(prop, N_("Cast Buffer Shadows"), N_("Allow this material to cast shadows from shadow buffer lamps")); + RNA_def_property_ui_text(prop, "Cast Buffer Shadows", "Allow this material to cast shadows from shadow buffer lamps"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_cast_approximate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_APPROX_OCCLUSION); - RNA_def_property_ui_text(prop, N_("Cast Approximate"), N_("Allow this material to cast shadows when using approximate ambient occlusion.")); + RNA_def_property_ui_text(prop, "Cast Approximate", "Allow this material to cast shadows when using approximate ambient occlusion."); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "use_tangent_shading", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TANGENT_V); - RNA_def_property_ui_text(prop, N_("Tangent Shading"), N_("Use the material's tangent vector instead of the normal for shading - for anisotropic shading effects")); + RNA_def_property_ui_text(prop, "Tangent Shading", "Use the material's tangent vector instead of the normal for shading - for anisotropic shading effects"); RNA_def_property_update(prop, 0, "rna_Material_update"); /* nested structs */ @@ -1796,60 +1794,60 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "MaterialRaytraceMirror"); RNA_def_property_pointer_funcs(prop, "rna_Material_mirror_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Raytrace Mirror"), N_("Raytraced reflection settings for the material")); + RNA_def_property_ui_text(prop, "Raytrace Mirror", "Raytraced reflection settings for the material"); prop= RNA_def_property(srna, "raytrace_transparency", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "MaterialRaytraceTransparency"); RNA_def_property_pointer_funcs(prop, "rna_Material_transp_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Raytrace Transparency"), N_("Raytraced transparency settings for the material")); + RNA_def_property_ui_text(prop, "Raytrace Transparency", "Raytraced transparency settings for the material"); prop= RNA_def_property(srna, "volume", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "vol"); RNA_def_property_struct_type(prop, "MaterialVolume"); - RNA_def_property_ui_text(prop, N_("Volume"), N_("Volume settings for the material")); + RNA_def_property_ui_text(prop, "Volume", "Volume settings for the material"); prop= RNA_def_property(srna, "halo", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "MaterialHalo"); RNA_def_property_pointer_funcs(prop, "rna_Material_halo_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Halo"), N_("Halo settings for the material")); + RNA_def_property_ui_text(prop, "Halo", "Halo settings for the material"); prop= RNA_def_property(srna, "subsurface_scattering", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "MaterialSubsurfaceScattering"); RNA_def_property_pointer_funcs(prop, "rna_Material_sss_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Subsurface Scattering"), N_("Subsurface scattering settings for the material")); + RNA_def_property_ui_text(prop, "Subsurface Scattering", "Subsurface scattering settings for the material"); prop= RNA_def_property(srna, "strand", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "MaterialStrand"); RNA_def_property_pointer_funcs(prop, "rna_Material_strand_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Strand"), N_("Strand settings for the material")); + RNA_def_property_ui_text(prop, "Strand", "Strand settings for the material"); prop= RNA_def_property(srna, "physics", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "MaterialPhysics"); RNA_def_property_pointer_funcs(prop, "rna_Material_physics_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Physics"), N_("Game physics settings")); + RNA_def_property_ui_text(prop, "Physics", "Game physics settings"); /* nodetree */ prop= RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "nodetree"); - RNA_def_property_ui_text(prop, N_("Node Tree"), N_("Node tree for node based materials")); + RNA_def_property_ui_text(prop, "Node Tree", "Node tree for node based materials"); prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1); RNA_def_property_boolean_funcs(prop, NULL, "rna_Material_use_nodes_set"); - RNA_def_property_ui_text(prop, N_("Use Nodes"), N_("Use shader nodes to render the material")); + RNA_def_property_ui_text(prop, "Use Nodes", "Use shader nodes to render the material"); RNA_def_property_update(prop, 0, "rna_Material_update"); prop= RNA_def_property(srna, "active_node_material", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Material"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_Material_active_node_material_get", "rna_Material_active_node_material_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Material"), N_("Active node material")); + RNA_def_property_ui_text(prop, "Material", "Active node material"); RNA_def_property_update(prop, NC_MATERIAL, NULL); /* common */ @@ -1862,7 +1860,7 @@ void RNA_def_material(BlenderRNA *brna) prop= RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "septex", 1); RNA_def_property_array(prop, 18); - RNA_def_property_ui_text(prop, N_("Use Textures"), N_("Enable/Disable each texture")); + RNA_def_property_ui_text(prop, "Use Textures", "Enable/Disable each texture"); RNA_def_property_update(prop, 0, "rna_Material_update"); rna_def_material_colors(srna); @@ -1893,24 +1891,24 @@ static void rna_def_texture_slots(BlenderRNA *brna, PropertyRNA *cprop, const ch RNA_def_property_srna(cprop, structname_slots); srna= RNA_def_struct(brna, structname_slots, NULL); RNA_def_struct_sdna(srna, "ID"); - RNA_def_struct_ui_text(srna, N_("Texture Slots"), N_("Collection of texture slots")); + RNA_def_struct_ui_text(srna, "Texture Slots", "Collection of texture slots"); /* functions */ func= RNA_def_function(srna, "add", "rna_mtex_texture_slots_add"); RNA_def_function_flag(func, FUNC_USE_SELF_ID|FUNC_NO_SELF|FUNC_USE_CONTEXT|FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "mtex", structname, "", N_("The newly initialized mtex.")); + parm= RNA_def_pointer(func, "mtex", structname, "", "The newly initialized mtex."); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "create", "rna_mtex_texture_slots_create"); RNA_def_function_flag(func, FUNC_USE_SELF_ID|FUNC_NO_SELF|FUNC_USE_CONTEXT|FUNC_USE_REPORTS); - parm= RNA_def_int(func, "index", 0, 0, INT_MAX, N_("Index"), N_("Slot index to initialize."), 0, INT_MAX); + parm= RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Slot index to initialize.", 0, INT_MAX); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "mtex", structname, "", N_("The newly initialized mtex.")); + parm= RNA_def_pointer(func, "mtex", structname, "", "The newly initialized mtex."); RNA_def_function_return(func, parm); func= RNA_def_function(srna, "clear", "rna_mtex_texture_slots_clear"); RNA_def_function_flag(func, FUNC_USE_SELF_ID|FUNC_NO_SELF|FUNC_USE_CONTEXT|FUNC_USE_REPORTS); - parm= RNA_def_int(func, "index", 0, 0, INT_MAX, N_("Index"), N_("Slot index to clear."), 0, INT_MAX); + parm= RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Slot index to clear.", 0, INT_MAX); RNA_def_property_flag(parm, PROP_REQUIRED); } @@ -1924,7 +1922,7 @@ void rna_def_mtex_common(BlenderRNA *brna, StructRNA *srna, const char *begin, prop= RNA_def_property(srna, "texture_slots", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, structname); RNA_def_property_collection_funcs(prop, begin, "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_dereference_get", 0, 0, 0); - RNA_def_property_ui_text(prop, N_("Textures"), N_("Texture slots defining the mapping and influence of textures")); + RNA_def_property_ui_text(prop, "Textures", "Texture slots defining the mapping and influence of textures"); rna_def_texture_slots(brna, prop, structname, structname_slots); prop= RNA_def_property(srna, "active_texture", PROP_POINTER, PROP_NONE); @@ -1933,13 +1931,13 @@ void rna_def_mtex_common(BlenderRNA *brna, StructRNA *srna, const char *begin, if(activeeditable) RNA_def_property_editable_func(prop, activeeditable); RNA_def_property_pointer_funcs(prop, activeget, activeset, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Active Texture"), N_("Active texture slot being displayed")); + RNA_def_property_ui_text(prop, "Active Texture", "Active texture slot being displayed"); RNA_def_property_update(prop, 0, update); prop= RNA_def_property(srna, "active_texture_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "texact"); RNA_def_property_range(prop, 0, MAX_MTEX-1); - RNA_def_property_ui_text(prop, N_("Active Texture Index"), N_("Index of active texture slot")); + RNA_def_property_ui_text(prop, "Active Texture Index", "Index of active texture slot"); RNA_def_property_update(prop, 0, update); } diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index c375aa427a6..80c98e8c428 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -43,8 +43,6 @@ #include "BLI_math_base.h" #include "BLI_math_rotation.h" -#include "BLF_api.h" - #ifdef RNA_RUNTIME #include "DNA_scene_types.h" @@ -1842,65 +1840,65 @@ static void rna_def_mesh(BlenderRNA *brna) PropertyRNA *prop; srna= RNA_def_struct(brna, "Mesh", "ID"); - RNA_def_struct_ui_text(srna, N_("Mesh"), N_("Mesh datablock defining geometric surfaces")); + RNA_def_struct_ui_text(srna, "Mesh", "Mesh datablock defining geometric surfaces"); RNA_def_struct_ui_icon(srna, ICON_MESH_DATA); prop= RNA_def_property(srna, "vertices", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mvert", "totvert"); RNA_def_property_struct_type(prop, "MeshVertex"); - RNA_def_property_ui_text(prop, N_("Vertices"), N_("Vertices of the mesh")); + RNA_def_property_ui_text(prop, "Vertices", "Vertices of the mesh"); rna_def_mesh_vertices(brna, prop); prop= RNA_def_property(srna, "edges", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "medge", "totedge"); RNA_def_property_struct_type(prop, "MeshEdge"); - RNA_def_property_ui_text(prop, N_("Edges"), N_("Edges of the mesh")); + RNA_def_property_ui_text(prop, "Edges", "Edges of the mesh"); rna_def_mesh_edges(brna, prop); prop= RNA_def_property(srna, "faces", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mface", "totface"); RNA_def_property_struct_type(prop, "MeshFace"); - RNA_def_property_ui_text(prop, N_("Faces"), N_("Faces of the mesh")); + RNA_def_property_ui_text(prop, "Faces", "Faces of the mesh"); rna_def_mesh_faces(brna, prop); prop= RNA_def_property(srna, "sticky", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "msticky", "totvert"); RNA_def_property_struct_type(prop, "MeshSticky"); - RNA_def_property_ui_text(prop, N_("Sticky"), N_("Sticky texture coordinates")); + RNA_def_property_ui_text(prop, "Sticky", "Sticky texture coordinates"); /* TODO, should this be allowed to be its self? */ prop= RNA_def_property(srna, "texture_mesh", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "texcomesh"); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); - RNA_def_property_ui_text(prop, N_("Texture Mesh"), N_("Use another mesh for texture indices (vertex indices must be aligned)")); + RNA_def_property_ui_text(prop, "Texture Mesh", "Use another mesh for texture indices (vertex indices must be aligned)"); /* UV textures */ prop= RNA_def_property(srna, "uv_textures", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_textures_begin", 0, 0, 0, "rna_Mesh_uv_textures_length", 0, 0); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); - RNA_def_property_ui_text(prop, N_("UV Textures"), ""); + RNA_def_property_ui_text(prop, "UV Textures", ""); rna_def_uv_textures(brna, prop); prop= RNA_def_property(srna, "uv_texture_clone", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_texture_clone_get", "rna_Mesh_uv_texture_clone_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Clone UV Texture"), N_("UV texture to be used as cloning source")); + RNA_def_property_ui_text(prop, "Clone UV Texture", "UV texture to be used as cloning source"); prop= RNA_def_property(srna, "uv_texture_clone_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_clone_index_get", "rna_Mesh_uv_texture_clone_index_set", "rna_Mesh_active_uv_texture_index_range"); - RNA_def_property_ui_text(prop, N_("Clone UV Texture Index"), N_("Clone UV texture index")); + RNA_def_property_ui_text(prop, "Clone UV Texture Index", "Clone UV texture index"); prop= RNA_def_property(srna, "uv_texture_stencil", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_texture_stencil_get", "rna_Mesh_uv_texture_stencil_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Mask UV Texture"), N_("UV texture to mask the painted area")); + RNA_def_property_ui_text(prop, "Mask UV Texture", "UV texture to mask the painted area"); prop= RNA_def_property(srna, "uv_texture_stencil_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_stencil_index_get", "rna_Mesh_uv_texture_stencil_index_set", "rna_Mesh_active_uv_texture_index_range"); - RNA_def_property_ui_text(prop, N_("Mask UV Texture Index"), N_("Mask UV texture index")); + RNA_def_property_ui_text(prop, "Mask UV Texture Index", "Mask UV texture index"); /* Vertex colors */ @@ -1908,30 +1906,30 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_vertex_colors_begin", 0, 0, 0, "rna_Mesh_vertex_colors_length", 0, 0); RNA_def_property_struct_type(prop, "MeshColorLayer"); - RNA_def_property_ui_text(prop, N_("Vertex Colors"), ""); + RNA_def_property_ui_text(prop, "Vertex Colors", ""); rna_def_vertex_colors(brna, prop); prop= RNA_def_property(srna, "layers_float", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", 0, 0, 0, "rna_Mesh_float_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshFloatPropertyLayer"); - RNA_def_property_ui_text(prop, N_("Float Property Layers"), ""); + RNA_def_property_ui_text(prop, "Float Property Layers", ""); prop= RNA_def_property(srna, "layers_int", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", 0, 0, 0, "rna_Mesh_int_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshIntPropertyLayer"); - RNA_def_property_ui_text(prop, N_("Int Property Layers"), ""); + RNA_def_property_ui_text(prop, "Int Property Layers", ""); prop= RNA_def_property(srna, "layers_string", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", 0, 0, 0, "rna_Mesh_string_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); - RNA_def_property_ui_text(prop, N_("String Property Layers"), ""); + RNA_def_property_ui_text(prop, "String Property Layers", ""); prop= RNA_def_property(srna, "use_auto_smooth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_AUTOSMOOTH); - RNA_def_property_ui_text(prop, N_("Auto Smooth"), N_("Treats all set-smoothed faces with angles less than the specified angle as 'smooth' during render")); + RNA_def_property_ui_text(prop, "Auto Smooth", "Treats all set-smoothed faces with angles less than the specified angle as 'smooth' during render"); #if 1 /* expose as radians */ prop= RNA_def_property(srna, "auto_smooth_angle", PROP_FLOAT, PROP_ANGLE); @@ -1942,38 +1940,38 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "smoothresh"); RNA_def_property_range(prop, 1, 80); #endif - RNA_def_property_ui_text(prop, N_("Auto Smooth Angle"), N_("Defines maximum angle between face normals that 'Auto Smooth' will operate on")); + RNA_def_property_ui_text(prop, "Auto Smooth Angle", "Defines maximum angle between face normals that 'Auto Smooth' will operate on"); prop= RNA_def_property(srna, "show_double_sided", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_TWOSIDED); - RNA_def_property_ui_text(prop, N_("Double Sided"), N_("Render/display the mesh with double or single sided lighting")); + RNA_def_property_ui_text(prop, "Double Sided", "Render/display the mesh with double or single sided lighting"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "texco_mesh", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "texcomesh"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Texture Space Mesh"), N_("Derive texture coordinates from another mesh")); + RNA_def_property_ui_text(prop, "Texture Space Mesh", "Derive texture coordinates from another mesh"); prop= RNA_def_property(srna, "shape_keys", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "key"); - RNA_def_property_ui_text(prop, N_("Shape Keys"), ""); + RNA_def_property_ui_text(prop, "Shape Keys", ""); /* texture space */ prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE); - RNA_def_property_ui_text(prop, N_("Auto Texture Space"), N_("Adjusts active object's texture space automatically when transforming object")); + RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Mesh_texspace_set"); prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Texture Space Location"), N_("Texture space location")); + RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_loc_get", "rna_Mesh_texspace_loc_set", NULL); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "texspace_size", PROP_FLOAT, PROP_XYZ); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Texture Space Size"), N_("Texture space size")); + RNA_def_property_ui_text(prop, "Texture Space Size", "Texture space size"); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_size_get", "rna_Mesh_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); @@ -1989,75 +1987,75 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol"); RNA_def_property_struct_type(prop, "Material"); - RNA_def_property_ui_text(prop, N_("Materials"), ""); + RNA_def_property_ui_text(prop, "Materials", ""); RNA_def_property_srna(prop, "IDMaterials"); /* see rna_ID.c */ /* Mesh Draw Options for Edit Mode*/ prop= RNA_def_property(srna, "show_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEDGES); - RNA_def_property_ui_text(prop, N_("Draw Edges"), N_("Displays selected edges using highlights in the 3D view and UV editor")); + RNA_def_property_ui_text(prop, "Draw Edges", "Displays selected edges using highlights in the 3D view and UV editor"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_all_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_ALLEDGES); - RNA_def_property_ui_text(prop, N_("All Edges"), N_("Displays all edges for wireframe in all view modes in the 3D view")); + RNA_def_property_ui_text(prop, "All Edges", "Displays all edges for wireframe in all view modes in the 3D view"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWFACES); - RNA_def_property_ui_text(prop, N_("Draw Faces"), N_("Displays all faces as shades in the 3D view and UV editor")); + RNA_def_property_ui_text(prop, "Draw Faces", "Displays all faces as shades in the 3D view and UV editor"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_normal_face", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWNORMALS); - RNA_def_property_ui_text(prop, N_("Draw Normals"), N_("Displays face normals as lines")); + RNA_def_property_ui_text(prop, "Draw Normals", "Displays face normals as lines"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_normal_vertex", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_VNORMALS); - RNA_def_property_ui_text(prop, N_("Draw Vertex Normals"), N_("Displays vertex normals as lines")); + RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Displays vertex normals as lines"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_crease", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWCREASES); - RNA_def_property_ui_text(prop, N_("Draw Creases"), N_("Displays creases created for subsurf weighting")); + RNA_def_property_ui_text(prop, "Draw Creases", "Displays creases created for subsurf weighting"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_bevel_weight", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWBWEIGHTS); - RNA_def_property_ui_text(prop, N_("Draw Bevel Weights"), N_("Displays weights created for the Bevel modifier")); + RNA_def_property_ui_text(prop, "Draw Bevel Weights", "Displays weights created for the Bevel modifier"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_seams", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSEAMS); - RNA_def_property_ui_text(prop, N_("Draw Seams"), N_("Displays UV unwrapping seams")); + RNA_def_property_ui_text(prop, "Draw Seams", "Displays UV unwrapping seams"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_sharp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSHARP); - RNA_def_property_ui_text(prop, N_("Draw Sharp"), N_("Displays sharp edges, used with the EdgeSplit modifier")); + RNA_def_property_ui_text(prop, "Draw Sharp", "Displays sharp edges, used with the EdgeSplit modifier"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_edge_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_EDGELEN); - RNA_def_property_ui_text(prop, N_("Edge Length"), N_("Displays selected edge lengths, Using global values when set in the transform panel")); + RNA_def_property_ui_text(prop, "Edge Length", "Displays selected edge lengths, Using global values when set in the transform panel"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_face_angle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEANG); - RNA_def_property_ui_text(prop, N_("Faces Angles"), N_("Displays the angles in the selected edges in degrees, Using global values when set in the transform panel")); + RNA_def_property_ui_text(prop, "Faces Angles", "Displays the angles in the selected edges in degrees, Using global values when set in the transform panel"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_face_area", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEAREA); - RNA_def_property_ui_text(prop, N_("Face Area"), N_("Displays the area of selected faces, Using global values when set in the transform panel")); + RNA_def_property_ui_text(prop, "Face Area", "Displays the area of selected faces, Using global values when set in the transform panel"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); /* editflag */ prop= RNA_def_property(srna, "use_mirror_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_MIRROR_X); - RNA_def_property_ui_text(prop, N_("X Mirror"), N_("X Axis mirror editing")); + RNA_def_property_ui_text(prop, "X Mirror", "X Axis mirror editing"); /* prop= RNA_def_property(srna, "use_mirror_y", PROP_BOOLEAN, PROP_NONE); @@ -2071,11 +2069,11 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "use_mirror_topology", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_MIRROR_TOPO); - RNA_def_property_ui_text(prop, N_("Topology Mirror"), N_("Use topology based mirroring. For when both sides of mesh have matching, unique topology")); + RNA_def_property_ui_text(prop, "Topology Mirror", "Use topology based mirroring. For when both sides of mesh have matching, unique topology"); prop= RNA_def_property(srna, "use_paint_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_PAINT_MASK); - RNA_def_property_ui_text(prop, N_("Paint Mask"), N_("Face selection masking for painting")); + RNA_def_property_ui_text(prop, "Paint Mask", "Face selection masking for painting"); RNA_def_property_ui_icon(prop, ICON_FACESEL_HLT, 0); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); @@ -2083,17 +2081,17 @@ static void rna_def_mesh(BlenderRNA *brna) /* readonly editmesh info - use for extrude menu */ prop= RNA_def_property(srna, "total_vert_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_vert_get", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Selected Vert Total"), N_("Selected vertex count in editmode")); + RNA_def_property_ui_text(prop, "Selected Vert Total", "Selected vertex count in editmode"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "total_edge_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_edge_get", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Selected Edge Total"), N_("Selected edge count in editmode")); + RNA_def_property_ui_text(prop, "Selected Edge Total", "Selected edge count in editmode"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "total_face_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_face_get", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Selected Face Total"), N_("Selected face count in editmode")); + RNA_def_property_ui_text(prop, "Selected Face Total", "Selected face count in editmode"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* pointers */ diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index e7ab9d04b78..464f676b7f6 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -45,7 +45,6 @@ #include "MEM_guardedalloc.h" #include "BLI_math.h" -#include "BLF_api.h" #include "BKE_animsys.h" #include "BKE_bmesh.h" /* For BevelModifierData */ diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 2d46e1adc91..bb223ac95b4 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -51,71 +51,70 @@ #include "BKE_group.h" /* needed for object_in_group() */ #include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */ -#include "BLF_api.h" #include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" EnumPropertyItem object_mode_items[] = { - {OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, N_("Object"), ""}, - {OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, N_("Edit"), ""}, - {OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, N_("Sculpt"), ""}, - {OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, N_("Vertex Paint"), ""}, - {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, N_("Weight Paint"), ""}, - {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, N_("Texture Paint"), ""}, - {OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, N_("Particle Edit"), ""}, - {OB_MODE_POSE, "POSE", ICON_POSE_HLT, N_("Pose"), ""}, + {OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object", ""}, + {OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit", ""}, + {OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt", ""}, + {OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""}, + {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""}, + {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""}, + {OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""}, + {OB_MODE_POSE, "POSE", ICON_POSE_HLT, "Pose", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem parent_type_items[] = { - {PAROBJECT, "OBJECT", 0, N_("Object"), N_("The object is parented to an object")}, - {PARCURVE, "CURVE", 0, N_("Curve"), N_("The object is parented to a curve")}, - {PARKEY, "KEY", 0, N_("Key"), ""}, - {PARSKEL, "ARMATURE", 0, N_("Armature"), ""}, - {PARSKEL, "LATTICE", 0, N_("Lattice"), N_("The object is parented to a lattice")}, // PARSKEL reuse will give issues - {PARVERT1, "VERTEX", 0, N_("Vertex"), N_("The object is parented to a vertex")}, - {PARVERT3, "VERTEX_3", 0, N_("3 Vertices"), ""}, - {PARBONE, "BONE", 0, N_("Bone"), N_("The object is parented to a bone")}, + {PAROBJECT, "OBJECT", 0, "Object", "The object is parented to an object"}, + {PARCURVE, "CURVE", 0, "Curve", "The object is parented to a curve"}, + {PARKEY, "KEY", 0, "Key", ""}, + {PARSKEL, "ARMATURE", 0, "Armature", ""}, + {PARSKEL, "LATTICE", 0, "Lattice", "The object is parented to a lattice"}, // PARSKEL reuse will give issues + {PARVERT1, "VERTEX", 0, "Vertex", "The object is parented to a vertex"}, + {PARVERT3, "VERTEX_3", 0, "3 Vertices", ""}, + {PARBONE, "BONE", 0, "Bone", "The object is parented to a bone"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem collision_bounds_items[] = { - {OB_BOUND_BOX, "BOX", 0, N_("Box"), ""}, - {OB_BOUND_SPHERE, "SPHERE", 0, N_("Sphere"), ""}, - {OB_BOUND_CYLINDER, "CYLINDER", 0, N_("Cylinder"), ""}, - {OB_BOUND_CONE, "CONE", 0, N_("Cone"), ""}, - {OB_BOUND_POLYT, "CONVEX_HULL", 0, N_("Convex Hull"), ""}, - {OB_BOUND_POLYH, "TRIANGLE_MESH", 0, N_("Triangle Mesh"), ""}, - {OB_BOUND_CAPSULE, "CAPSULE", 0, N_("Capsule"), ""}, + {OB_BOUND_BOX, "BOX", 0, "Box", ""}, + {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", ""}, + {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", ""}, + {OB_BOUND_CONE, "CONE", 0, "Cone", ""}, + {OB_BOUND_POLYT, "CONVEX_HULL", 0, "Convex Hull", ""}, + {OB_BOUND_POLYH, "TRIANGLE_MESH", 0, "Triangle Mesh", ""}, + {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", ""}, //{OB_DYN_MESH, "DYNAMIC_MESH", 0, "Dynamic Mesh", ""}, {0, NULL, 0, NULL, NULL}}; EnumPropertyItem metaelem_type_items[] = { - {MB_BALL, "BALL", ICON_META_BALL, N_("Ball"), ""}, - {MB_TUBE, "CAPSULE", ICON_META_CAPSULE, N_("Capsule"), ""}, - {MB_PLANE, "PLANE", ICON_META_PLANE, N_("Plane"), ""}, - {MB_ELIPSOID, "ELLIPSOID", ICON_META_ELLIPSOID, N_("Ellipsoid"), ""}, // NOTE: typo at original definition! - {MB_CUBE, "CUBE", ICON_META_CUBE, N_("Cube"), ""}, + {MB_BALL, "BALL", ICON_META_BALL, "Ball", ""}, + {MB_TUBE, "CAPSULE", ICON_META_CAPSULE, "Capsule", ""}, + {MB_PLANE, "PLANE", ICON_META_PLANE, "Plane", ""}, + {MB_ELIPSOID, "ELLIPSOID", ICON_META_ELLIPSOID, "Ellipsoid", ""}, // NOTE: typo at original definition! + {MB_CUBE, "CUBE", ICON_META_CUBE, "Cube", ""}, {0, NULL, 0, NULL, NULL}}; /* used for 2 enums */ -#define OBTYPE_CU_CURVE {OB_CURVE, "CURVE", 0, N_("Curve"), ""} -#define OBTYPE_CU_SURF {OB_SURF, "SURFACE", 0, N_("Surface"), ""} -#define OBTYPE_CU_FONT {OB_FONT, "FONT", 0, N_("Font"), ""} +#define OBTYPE_CU_CURVE {OB_CURVE, "CURVE", 0, "Curve", ""} +#define OBTYPE_CU_SURF {OB_SURF, "SURFACE", 0, "Surface", ""} +#define OBTYPE_CU_FONT {OB_FONT, "FONT", 0, "Font", ""} EnumPropertyItem object_type_items[] = { - {OB_MESH, "MESH", 0, N_("Mesh"), ""}, + {OB_MESH, "MESH", 0, "Mesh", ""}, OBTYPE_CU_CURVE, OBTYPE_CU_SURF, - {OB_MBALL, "META", 0, N_("Meta"), ""}, + {OB_MBALL, "META", 0, "Meta", ""}, OBTYPE_CU_FONT, {0, "", 0, NULL, NULL}, - {OB_ARMATURE, "ARMATURE", 0, N_("Armature"), ""}, - {OB_LATTICE, "LATTICE", 0, N_("Lattice"), ""}, - {OB_EMPTY, "EMPTY", 0, N_("Empty"), ""}, + {OB_ARMATURE, "ARMATURE", 0, "Armature", ""}, + {OB_LATTICE, "LATTICE", 0, "Lattice", ""}, + {OB_EMPTY, "EMPTY", 0, "Empty", ""}, {0, "", 0, NULL, NULL}, - {OB_CAMERA, "CAMERA", 0, N_("Camera"), ""}, - {OB_LAMP, "LAMP", 0, N_("Lamp"), ""}, + {OB_CAMERA, "CAMERA", 0, "Camera", ""}, + {OB_LAMP, "LAMP", 0, "Lamp", ""}, {OB_SPEAKER, "SPEAKER", 0, "Speaker", ""}, {0, NULL, 0, NULL, NULL}}; @@ -1305,8 +1304,8 @@ static void rna_def_material_slot(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem link_items[] = { - {1, "OBJECT", 0, N_("Object"), ""}, - {0, "DATA", 0, N_("Data"), ""}, + {1, "OBJECT", 0, "Object", ""}, + {0, "DATA", 0, "Data", ""}, {0, NULL, 0, NULL, NULL}}; /* NOTE: there is no MaterialSlot equivalent in DNA, so the internal @@ -1314,25 +1313,25 @@ static void rna_def_material_slot(BlenderRNA *brna) * get/set for the properties. */ srna= RNA_def_struct(brna, "MaterialSlot", NULL); - RNA_def_struct_ui_text(srna, N_("Material Slot"), N_("Material slot in an object")); + RNA_def_struct_ui_text(srna, "Material Slot", "Material slot in an object"); RNA_def_struct_ui_icon(srna, ICON_MATERIAL_DATA); prop= RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Material"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_MaterialSlot_material_get", "rna_MaterialSlot_material_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Material"), N_("Material datablock used by this material slot")); + RNA_def_property_ui_text(prop, "Material", "Material datablock used by this material slot"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_MaterialSlot_update"); prop= RNA_def_property(srna, "link", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, link_items); RNA_def_property_enum_funcs(prop, "rna_MaterialSlot_link_get", "rna_MaterialSlot_link_set", NULL); - RNA_def_property_ui_text(prop, N_("Link"), N_("Link material to object or the object's data")); + RNA_def_property_ui_text(prop, "Link", "Link material to object or the object's data"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_MaterialSlot_update"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_MaterialSlot_name_get", "rna_MaterialSlot_name_length", NULL); - RNA_def_property_ui_text(prop, N_("Name"), N_("Material slot name")); + RNA_def_property_ui_text(prop, "Name", "Material slot name"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_struct_name_property(srna, prop); } @@ -1343,13 +1342,13 @@ static void rna_def_object_game_settings(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem body_type_items[] = { - {OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, N_("No Collision"), N_("Disable collision for this object")}, - {OB_BODY_TYPE_STATIC, "STATIC", 0, N_("Static"), N_("Stationary object")}, - {OB_BODY_TYPE_DYNAMIC, "DYNAMIC", 0, N_("Dynamic"), N_("Linear physics")}, - {OB_BODY_TYPE_RIGID, "RIGID_BODY", 0, N_("Rigid Body"), N_("Linear and angular physics")}, - {OB_BODY_TYPE_SOFT, "SOFT_BODY", 0, N_("Soft Body"), N_("Soft body")}, - {OB_BODY_TYPE_OCCLUDER, "OCCLUDE", 0, N_("Occlude"), N_("Occluder for optimizing scene rendering")}, - {OB_BODY_TYPE_SENSOR, "SENSOR", 0, N_("Sensor"), N_("Collision Sensor, detects static and dynamic objects but not the other collision sensor objects")}, + {OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, "No Collision", "Disable collision for this object"}, + {OB_BODY_TYPE_STATIC, "STATIC", 0, "Static", "Stationary object"}, + {OB_BODY_TYPE_DYNAMIC, "DYNAMIC", 0, "Dynamic", "Linear physics"}, + {OB_BODY_TYPE_RIGID, "RIGID_BODY", 0, "Rigid Body", "Linear and angular physics"}, + {OB_BODY_TYPE_SOFT, "SOFT_BODY", 0, "Soft Body", "Soft body"}, + {OB_BODY_TYPE_OCCLUDER, "OCCLUDE", 0, "Occlude", "Occluder for optimizing scene rendering"}, + {OB_BODY_TYPE_SENSOR, "SENSOR", 0, "Sensor", "Collision Sensor, detects static and dynamic objects but not the other collision sensor objects"}, {OB_BODY_TYPE_NAVMESH, "NAVMESH", 0, "Navigation Mesh", "Navigation mesh"}, {0, NULL, 0, NULL, NULL}}; @@ -1728,14 +1727,14 @@ static void rna_def_object(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem empty_drawtype_items[] = { - {OB_PLAINAXES, "PLAIN_AXES", 0, N_("Plain Axes"), ""}, - {OB_ARROWS, "ARROWS", 0, N_("Arrows"), ""}, - {OB_SINGLE_ARROW, "SINGLE_ARROW", 0, N_("Single Arrow"), ""}, - {OB_CIRCLE, "CIRCLE", 0, N_("Circle"), ""}, - {OB_CUBE, "CUBE", 0, N_("Cube"), ""}, - {OB_EMPTY_SPHERE, "SPHERE", 0, N_("Sphere"), ""}, - {OB_EMPTY_CONE, "CONE", 0, N_("Cone"), ""}, - {OB_EMPTY_IMAGE, "IMAGE", 0, N_("Image"), ""}, + {OB_PLAINAXES, "PLAIN_AXES", 0, "Plain Axes", ""}, + {OB_ARROWS, "ARROWS", 0, "Arrows", ""}, + {OB_SINGLE_ARROW, "SINGLE_ARROW", 0, "Single Arrow", ""}, + {OB_CIRCLE, "CIRCLE", 0, "Circle", ""}, + {OB_CUBE, "CUBE", 0, "Cube", ""}, + {OB_EMPTY_SPHERE, "SPHERE", 0, "Sphere", ""}, + {OB_EMPTY_CONE, "CONE", 0, "Cone", ""}, + {OB_EMPTY_IMAGE, "IMAGE", 0, "Image", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem track_items[] = { @@ -1754,40 +1753,40 @@ static void rna_def_object(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem drawtype_items[] = { - {OB_BOUNDBOX, "BOUNDS", 0, N_("Bounds"), N_("Draw the bounding box of the object")}, - {OB_WIRE, "WIRE", 0, N_("Wire"), N_("Draw the object as a wireframe")}, - {OB_SOLID, "SOLID", 0, N_("Solid"), N_("Draw the object as a solid (If solid drawing is enabled in the viewport)")}, + {OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Draw the bounding box of the object"}, + {OB_WIRE, "WIRE", 0, "Wire", "Draw the object as a wireframe"}, + {OB_SOLID, "SOLID", 0, "Solid", "Draw the object as a solid (If solid drawing is enabled in the viewport)"}, // disabled {OB_SHADED, "SHADED", 0, "Shaded", ""}, - {OB_TEXTURE, "TEXTURED", 0, N_("Textured"), N_("Draw the object with textures (If textures are enabled in the viewport)")}, + {OB_TEXTURE, "TEXTURED", 0, "Textured", "Draw the object with textures (If textures are enabled in the viewport)"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem boundtype_items[] = { - {OB_BOUND_BOX, "BOX", 0, N_("Box"), N_("Draw bounds as box")}, - {OB_BOUND_SPHERE, "SPHERE", 0, N_("Sphere"), N_("Draw bounds as sphere")}, - {OB_BOUND_CYLINDER, "CYLINDER", 0, N_("Cylinder"), N_("Draw bounds as cylinder")}, - {OB_BOUND_CONE, "CONE", 0, N_("Cone"), N_("Draw bounds as cone")}, - {OB_BOUND_POLYH, "POLYHEDRON", 0, N_("Polyhedron"), N_("Draw bounds as polyhedron")}, - {OB_BOUND_CAPSULE, "CAPSULE", 0, N_("Capsule"), N_("Draw bounds as capsule")}, + {OB_BOUND_BOX, "BOX", 0, "Box", "Draw bounds as box"}, + {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", "Draw bounds as sphere"}, + {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", "Draw bounds as cylinder"}, + {OB_BOUND_CONE, "CONE", 0, "Cone", "Draw bounds as cone"}, + {OB_BOUND_POLYH, "POLYHEDRON", 0, "Polyhedron", "Draw bounds as polyhedron"}, + {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", "Draw bounds as capsule"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem dupli_items[] = { {0, "NONE", 0, "None", ""}, - {OB_DUPLIFRAMES, "FRAMES", 0, N_("Frames"), N_("Make copy of object for every frame")}, - {OB_DUPLIVERTS, "VERTS", 0, N_("Verts"), N_("Duplicate child objects on all vertices")}, - {OB_DUPLIFACES, "FACES", 0, N_("Faces"), N_("Duplicate child objects on all faces")}, - {OB_DUPLIGROUP, "GROUP", 0, N_("Group"), N_("Enable group instancing")}, + {OB_DUPLIFRAMES, "FRAMES", 0, "Frames", "Make copy of object for every frame"}, + {OB_DUPLIVERTS, "VERTS", 0, "Verts", "Duplicate child objects on all vertices"}, + {OB_DUPLIFACES, "FACES", 0, "Faces", "Duplicate child objects on all faces"}, + {OB_DUPLIGROUP, "GROUP", 0, "Group", "Enable group instancing"}, {0, NULL, 0, NULL, NULL}}; // XXX: this RNA enum define is currently duplicated for objects, since there is some text here which is not applicable static EnumPropertyItem prop_rotmode_items[] = { - {ROT_MODE_QUAT, "QUATERNION", 0, N_("Quaternion (WXYZ)"), N_("No Gimbal Lock")}, - {ROT_MODE_XYZ, "XYZ", 0, N_("XYZ Euler"), N_("XYZ Rotation Order. Prone to Gimbal Lock. (Default)")}, - {ROT_MODE_XZY, "XZY", 0, N_("XZY Euler"), N_("XZY Rotation Order. Prone to Gimbal Lock")}, - {ROT_MODE_YXZ, "YXZ", 0, N_("YXZ Euler"), N_("YXZ Rotation Order. Prone to Gimbal Lock")}, - {ROT_MODE_YZX, "YZX", 0, N_("YZX Euler"), N_("YZX Rotation Order. Prone to Gimbal Lock")}, - {ROT_MODE_ZXY, "ZXY", 0, N_("ZXY Euler"), N_("ZXY Rotation Order. Prone to Gimbal Lock")}, - {ROT_MODE_ZYX, "ZYX", 0, N_("ZYX Euler"), N_("ZYX Rotation Order. Prone to Gimbal Lock")}, - {ROT_MODE_AXISANGLE, "AXIS_ANGLE", 0, N_("Axis Angle"), N_("Axis Angle (W+XYZ). Defines a rotation around some axis defined by 3D-Vector")}, + {ROT_MODE_QUAT, "QUATERNION", 0, "Quaternion (WXYZ)", "No Gimbal Lock"}, + {ROT_MODE_XYZ, "XYZ", 0, "XYZ Euler", "XYZ Rotation Order. Prone to Gimbal Lock. (Default)"}, + {ROT_MODE_XZY, "XZY", 0, "XZY Euler", "XZY Rotation Order. Prone to Gimbal Lock"}, + {ROT_MODE_YXZ, "YXZ", 0, "YXZ Euler", "YXZ Rotation Order. Prone to Gimbal Lock"}, + {ROT_MODE_YZX, "YZX", 0, "YZX Euler", "YZX Rotation Order. Prone to Gimbal Lock"}, + {ROT_MODE_ZXY, "ZXY", 0, "ZXY Euler", "ZXY Rotation Order. Prone to Gimbal Lock"}, + {ROT_MODE_ZYX, "ZYX", 0, "ZYX Euler", "ZYX Rotation Order. Prone to Gimbal Lock"}, + {ROT_MODE_AXISANGLE, "AXIS_ANGLE", 0, "Axis Angle", "Axis Angle (W+XYZ). Defines a rotation around some axis defined by 3D-Vector"}, {0, NULL, 0, NULL, NULL}}; static float default_quat[4] = {1,0,0,0}; /* default quaternion values */ @@ -1796,7 +1795,7 @@ static void rna_def_object(BlenderRNA *brna) static int boundbox_dimsize[]= {8, 3}; srna= RNA_def_struct(brna, "Object", "ID"); - RNA_def_struct_ui_text(srna, N_("Object"), N_("Object datablock defining an object in a scene")); + RNA_def_struct_ui_text(srna, "Object", "Object datablock defining an object in a scene"); RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA); @@ -1804,32 +1803,32 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ID"); RNA_def_property_pointer_funcs(prop, NULL, "rna_Object_data_set", "rna_Object_data_typef", NULL); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK); - RNA_def_property_ui_text(prop, N_("Data"), N_("Object data")); + RNA_def_property_ui_text(prop, "Data", "Object data"); RNA_def_property_update(prop, 0, "rna_Object_internal_update_data"); prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, object_type_items); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Type"), N_("Type of Object")); + RNA_def_property_ui_text(prop, "Type", "Type of Object"); prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, object_mode_items); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Mode"), N_("Object interaction mode")); + RNA_def_property_ui_text(prop, "Mode", "Object interaction mode"); prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "lay", 1); RNA_def_property_array(prop, 20); - RNA_def_property_ui_text(prop, N_("Layers"), N_("Layers the object is on")); + RNA_def_property_ui_text(prop, "Layers", "Layers the object is on"); RNA_def_property_boolean_funcs(prop, NULL, "rna_Object_layer_set"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_layer_update"); prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT); - RNA_def_property_ui_text(prop, N_("Select"), N_("Object selection state")); + RNA_def_property_ui_text(prop, "Select", "Object selection state"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_select_update"); /* for data access */ @@ -1837,32 +1836,32 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_multi_array(prop, 2, boundbox_dimsize); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_float_funcs(prop, "rna_Object_boundbox_get", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Bound Box"), N_("Objects bound box in object-space coordinates, all values are -1.0 when not available.")); + RNA_def_property_ui_text(prop, "Bound Box", "Objects bound box in object-space coordinates, all values are -1.0 when not available."); /* parent */ prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_funcs(prop, NULL, "rna_Object_parent_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); - RNA_def_property_ui_text(prop, N_("Parent"), N_("Parent Object")); + RNA_def_property_ui_text(prop, "Parent", "Parent Object"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_dependency_update"); prop= RNA_def_property(srna, "parent_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "partype"); RNA_def_property_enum_items(prop, parent_type_items); RNA_def_property_enum_funcs(prop, NULL, "rna_Object_parent_type_set", "rna_Object_parent_type_itemf"); - RNA_def_property_ui_text(prop, N_("Parent Type"), N_("Type of parent relation")); + RNA_def_property_ui_text(prop, "Parent Type", "Type of parent relation"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_dependency_update"); prop= RNA_def_property(srna, "parent_vertices", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "par1"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Parent Vertices"), N_("Indices of vertices in cases of a vertex parenting relation")); + RNA_def_property_ui_text(prop, "Parent Vertices", "Indices of vertices in cases of a vertex parenting relation"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "parent_bone", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "parsubstr"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Object_parent_bone_set"); - RNA_def_property_ui_text(prop, N_("Parent Bone"), N_("Name of parent bone in case of a bone parenting relation")); + RNA_def_property_ui_text(prop, "Parent Bone", "Name of parent bone in case of a bone parenting relation"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_dependency_update"); /* Track and Up flags */ @@ -1870,41 +1869,41 @@ static void rna_def_object(BlenderRNA *brna) prop= RNA_def_property(srna, "track_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "trackflag"); RNA_def_property_enum_items(prop, track_items); - RNA_def_property_ui_text(prop, N_("Track Axis"), N_("Axis that points in 'forward' direction (applies to DupliFrame when parent 'Follow' is enabled)")); + RNA_def_property_ui_text(prop, "Track Axis", "Axis that points in 'forward' direction (applies to DupliFrame when parent 'Follow' is enabled)"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "up_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "upflag"); RNA_def_property_enum_items(prop, up_items); - RNA_def_property_ui_text(prop, N_("Up Axis"), N_("Axis that points in the upward direction (applies to DupliFrame when parent 'Follow' is enabled)")); + RNA_def_property_ui_text(prop, "Up Axis", "Axis that points in the upward direction (applies to DupliFrame when parent 'Follow' is enabled)"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); /* proxy */ prop= RNA_def_property(srna, "proxy", PROP_POINTER, PROP_NONE); - RNA_def_property_ui_text(prop, N_("Proxy"), N_("Library object this proxy object controls")); + RNA_def_property_ui_text(prop, "Proxy", "Library object this proxy object controls"); prop= RNA_def_property(srna, "proxy_group", PROP_POINTER, PROP_NONE); - RNA_def_property_ui_text(prop, N_("Proxy Group"), N_("Library group duplicator object this proxy object controls")); + RNA_def_property_ui_text(prop, "Proxy Group", "Library group duplicator object this proxy object controls"); /* materials */ prop= RNA_def_property(srna, "material_slots", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol"); RNA_def_property_struct_type(prop, "MaterialSlot"); RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_iterator_array_get", NULL, NULL, NULL); /* don't dereference pointer! */ - RNA_def_property_ui_text(prop, N_("Material Slots"), N_("Material slots in the object")); + RNA_def_property_ui_text(prop, "Material Slots", "Material slots in the object"); prop= RNA_def_property(srna, "active_material", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Material"); RNA_def_property_pointer_funcs(prop, "rna_Object_active_material_get", "rna_Object_active_material_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Active Material"), N_("Active material being displayed")); + RNA_def_property_ui_text(prop, "Active Material", "Active material being displayed"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_MaterialSlot_update"); prop= RNA_def_property(srna, "active_material_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "actcol"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_funcs(prop, "rna_Object_active_material_index_get", "rna_Object_active_material_index_set", "rna_Object_active_material_index_range"); - RNA_def_property_ui_text(prop, N_("Active Material Index"), N_("Index of active material slot")); + RNA_def_property_ui_text(prop, "Active Material Index", "Index of active material slot"); RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL); /* transform */ @@ -1912,14 +1911,14 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "loc"); RNA_def_property_editable_array_func(prop, "rna_Object_location_editable"); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3); - RNA_def_property_ui_text(prop, N_("Location"), N_("Location of the object")); + RNA_def_property_ui_text(prop, "Location", "Location of the object"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "rotation_quaternion", PROP_FLOAT, PROP_QUATERNION); RNA_def_property_float_sdna(prop, NULL, "quat"); RNA_def_property_editable_array_func(prop, "rna_Object_rotation_4d_editable"); RNA_def_property_float_array_default(prop, default_quat); - RNA_def_property_ui_text(prop, N_("Quaternion Rotation"), N_("Rotation in Quaternions")); + RNA_def_property_ui_text(prop, "Quaternion Rotation", "Rotation in Quaternions"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); /* XXX: for axis-angle, it would have been nice to have 2 separate fields for UI purposes, but @@ -1930,20 +1929,20 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_float_funcs(prop, "rna_Object_rotation_axis_angle_get", "rna_Object_rotation_axis_angle_set", NULL); RNA_def_property_editable_array_func(prop, "rna_Object_rotation_4d_editable"); RNA_def_property_float_array_default(prop, default_axisAngle); - RNA_def_property_ui_text(prop, N_("Axis-Angle Rotation"), N_("Angle of Rotation for Axis-Angle rotation representation")); + RNA_def_property_ui_text(prop, "Axis-Angle Rotation", "Angle of Rotation for Axis-Angle rotation representation"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "rotation_euler", PROP_FLOAT, PROP_EULER); RNA_def_property_float_sdna(prop, NULL, "rot"); RNA_def_property_editable_array_func(prop, "rna_Object_rotation_euler_editable"); - RNA_def_property_ui_text(prop, N_("Euler Rotation"), N_("Rotation in Eulers")); + RNA_def_property_ui_text(prop, "Euler Rotation", "Rotation in Eulers"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "rotation_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rotmode"); RNA_def_property_enum_items(prop, prop_rotmode_items); // XXX move to using a single define of this someday RNA_def_property_enum_funcs(prop, NULL, "rna_Object_rotation_mode_set", NULL); - RNA_def_property_ui_text(prop, N_("Rotation Mode"), ""); + RNA_def_property_ui_text(prop, "Rotation Mode", ""); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ); @@ -1951,59 +1950,59 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_editable_array_func(prop, "rna_Object_scale_editable"); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3); RNA_def_property_float_array_default(prop, default_scale); - RNA_def_property_ui_text(prop, N_("Scale"), N_("Scaling of the object")); + RNA_def_property_ui_text(prop, "Scale", "Scaling of the object"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dimensions", PROP_FLOAT, PROP_XYZ_LENGTH); RNA_def_property_array(prop, 3); RNA_def_property_float_funcs(prop, "rna_Object_dimensions_get", "rna_Object_dimensions_set", NULL); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3); - RNA_def_property_ui_text(prop, N_("Dimensions"), N_("Absolute bounding box dimensions of the object")); + RNA_def_property_ui_text(prop, "Dimensions", "Absolute bounding box dimensions of the object"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); /* delta transforms */ prop= RNA_def_property(srna, "delta_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "dloc"); - RNA_def_property_ui_text(prop, N_("Delta Location"), N_("Extra translation added to the location of the object")); + RNA_def_property_ui_text(prop, "Delta Location", "Extra translation added to the location of the object"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "delta_rotation_euler", PROP_FLOAT, PROP_EULER); RNA_def_property_float_sdna(prop, NULL, "drot"); - RNA_def_property_ui_text(prop, N_("Delta Rotation (Euler)"), N_("Extra rotation added to the rotation of the object (when using Euler rotations)")); + RNA_def_property_ui_text(prop, "Delta Rotation (Euler)", "Extra rotation added to the rotation of the object (when using Euler rotations)"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "delta_rotation_quaternion", PROP_FLOAT, PROP_QUATERNION); RNA_def_property_float_sdna(prop, NULL, "dquat"); RNA_def_property_float_array_default(prop, default_quat); - RNA_def_property_ui_text(prop, N_("Delta Rotation (Quaternion)"), N_("Extra rotation added to the rotation of the object (when using Quaternion rotations)")); + RNA_def_property_ui_text(prop, "Delta Rotation (Quaternion)", "Extra rotation added to the rotation of the object (when using Quaternion rotations)"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); #if 0 // XXX not supported well yet... prop= RNA_def_property(srna, "delta_rotation_axis_angle", PROP_FLOAT, PROP_AXISANGLE); RNA_def_property_float_sdna(prop, NULL, "dquat"); // FIXME: this is not a single field any more! (drotAxis and drotAngle) RNA_def_property_float_array_default(prop, default_axisAngle); - RNA_def_property_ui_text(prop, N_("Delta Rotation (Axis Angle)"), N_("Extra rotation added to the rotation of the object (when using Axis-Angle rotations)")); + RNA_def_property_ui_text(prop, "Delta Rotation (Axis Angle)", "Extra rotation added to the rotation of the object (when using Axis-Angle rotations)"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); #endif prop= RNA_def_property(srna, "delta_scale", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "dsize"); - RNA_def_property_ui_text(prop, N_("Delta Scale"), N_("Extra scaling added to the scale of the object")); + RNA_def_property_ui_text(prop, "Delta Scale", "Extra scaling added to the scale of the object"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); /* transform locks */ prop= RNA_def_property(srna, "lock_location", PROP_BOOLEAN, PROP_XYZ); RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_LOCX); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Lock Location"), N_("Lock editing of location in the interface")); + RNA_def_property_ui_text(prop, "Lock Location", "Lock editing of location in the interface"); RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "lock_rotation", PROP_BOOLEAN, PROP_XYZ); RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTX); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Lock Rotation"), N_("Lock editing of rotation in the interface")); + RNA_def_property_ui_text(prop, "Lock Rotation", "Lock editing of rotation in the interface"); RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); @@ -2011,16 +2010,16 @@ static void rna_def_object(BlenderRNA *brna) prop= RNA_def_property(srna, "lock_rotation_w", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROTW); RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1); - RNA_def_property_ui_text(prop, N_("Lock Rotation (4D Angle)"), N_("Lock editing of 'angle' component of four-component rotations in the interface")); + RNA_def_property_ui_text(prop, "Lock Rotation (4D Angle)", "Lock editing of 'angle' component of four-component rotations in the interface"); // XXX this needs a better name prop= RNA_def_property(srna, "lock_rotations_4d", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_ROT4D); - RNA_def_property_ui_text(prop, N_("Lock Rotations (4D)"), N_("Lock editing of four component rotations by components (instead of as Eulers)")); + RNA_def_property_ui_text(prop, "Lock Rotations (4D)", "Lock editing of four component rotations by components (instead of as Eulers)"); prop= RNA_def_property(srna, "lock_scale", PROP_BOOLEAN, PROP_XYZ); RNA_def_property_boolean_sdna(prop, NULL, "protectflag", OB_LOCK_SCALEX); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Lock Scale"), N_("Lock editing of scale in the interface")); + RNA_def_property_ui_text(prop, "Lock Scale", "Lock editing of scale in the interface"); RNA_def_property_ui_icon(prop, ICON_UNLOCKED, 1); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); @@ -2029,20 +2028,20 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "obmat"); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, N_("Matrix World"), N_("Worldspace transformation matrix")); + RNA_def_property_ui_text(prop, "Matrix World", "Worldspace transformation matrix"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_matrix_world_update"); prop= RNA_def_property(srna, "matrix_local", PROP_FLOAT, PROP_MATRIX); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, N_("Local Matrix"), N_("Parent relative transformation matrix")); + RNA_def_property_ui_text(prop, "Local Matrix", "Parent relative transformation matrix"); RNA_def_property_float_funcs(prop, "rna_Object_matrix_local_get", "rna_Object_matrix_local_set", NULL); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL); prop= RNA_def_property(srna, "matrix_basis", PROP_FLOAT, PROP_MATRIX); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, N_("Input Matrix"), N_("Matrix access to location, rotation and scale (including deltas), before constraints and parenting are applied.")); + RNA_def_property_ui_text(prop, "Input Matrix", "Matrix access to location, rotation and scale (including deltas), before constraints and parenting are applied."); RNA_def_property_float_funcs(prop, "rna_Object_matrix_basis_get", "rna_Object_matrix_basis_set", NULL); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); @@ -2062,7 +2061,7 @@ static void rna_def_object(BlenderRNA *brna) /* constraints */ prop= RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "Constraint"); - RNA_def_property_ui_text(prop, N_("Constraints"), N_("Constraints affecting the transformation of the object")); + RNA_def_property_ui_text(prop, "Constraints", "Constraints affecting the transformation of the object"); // RNA_def_property_collection_funcs(prop, 0, 0, 0, 0, 0, 0, 0, "constraints__add", "constraints__remove"); rna_def_object_constraints(brna, prop); @@ -2071,44 +2070,44 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "GameObjectSettings"); RNA_def_property_pointer_funcs(prop, "rna_Object_game_settings_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Game Settings"), N_("Game engine related settings for the object")); + RNA_def_property_ui_text(prop, "Game Settings", "Game engine related settings for the object"); /* vertex groups */ prop= RNA_def_property(srna, "vertex_groups", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "defbase", NULL); RNA_def_property_struct_type(prop, "VertexGroup"); - RNA_def_property_ui_text(prop, N_("Vertex Groups"), N_("Vertex groups of the object")); + RNA_def_property_ui_text(prop, "Vertex Groups", "Vertex groups of the object"); rna_def_object_vertex_groups(brna, prop); /* empty */ prop= RNA_def_property(srna, "empty_draw_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "empty_drawtype"); RNA_def_property_enum_items(prop, empty_drawtype_items); - RNA_def_property_ui_text(prop, N_("Empty Display Type"), N_("Viewport display style for empties")); + RNA_def_property_ui_text(prop, "Empty Display Type", "Viewport display style for empties"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "empty_draw_size", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "empty_drawsize"); RNA_def_property_range(prop, 0.0001f, 1000.0f); RNA_def_property_ui_range(prop, 0.01, 100, 1, 2); - RNA_def_property_ui_text(prop, N_("Empty Display Size"), N_("Size of display for empties in the viewport")); + RNA_def_property_ui_text(prop, "Empty Display Size", "Size of display for empties in the viewport"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "empty_image_offset", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "ima_ofs"); - RNA_def_property_ui_text(prop, N_("Origin Offset"), N_("Origin offset distance")); + RNA_def_property_ui_text(prop, "Origin Offset", "Origin offset distance"); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 0.1f, 2); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); /* render */ prop= RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "index"); - RNA_def_property_ui_text(prop, N_("Pass Index"), N_("Index # for the IndexOB render pass")); + RNA_def_property_ui_text(prop, "Pass Index", "Index # for the IndexOB render pass"); RNA_def_property_update(prop, NC_OBJECT, NULL); prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "col"); - RNA_def_property_ui_text(prop, N_("Color"), N_("Object color and alpha, used when faces have the ObColor mode enabled")); + RNA_def_property_ui_text(prop, "Color", "Object color and alpha, used when faces have the ObColor mode enabled"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); /* physics */ @@ -2116,41 +2115,41 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "pd"); RNA_def_property_struct_type(prop, "FieldSettings"); RNA_def_property_pointer_funcs(prop, "rna_Object_field_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Field Settings"), N_("Settings for using the objects as a field in physics simulation")); + RNA_def_property_ui_text(prop, "Field Settings", "Settings for using the objects as a field in physics simulation"); prop= RNA_def_property(srna, "collision", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "pd"); RNA_def_property_struct_type(prop, "CollisionSettings"); RNA_def_property_pointer_funcs(prop, "rna_Object_collision_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Collision Settings"), N_("Settings for using the objects as a collider in physics simulation")); + RNA_def_property_ui_text(prop, "Collision Settings", "Settings for using the objects as a collider in physics simulation"); prop= RNA_def_property(srna, "soft_body", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "soft"); RNA_def_property_struct_type(prop, "SoftBodySettings"); - RNA_def_property_ui_text(prop, N_("Soft Body Settings"), N_("Settings for soft body simulation")); + RNA_def_property_ui_text(prop, "Soft Body Settings", "Settings for soft body simulation"); prop= RNA_def_property(srna, "particle_systems", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "particlesystem", NULL); RNA_def_property_struct_type(prop, "ParticleSystem"); - RNA_def_property_ui_text(prop, N_("Particle Systems"), N_("Particle systems emitted from the object")); + RNA_def_property_ui_text(prop, "Particle Systems", "Particle systems emitted from the object"); rna_def_object_particle_systems(brna, prop); /* restrict */ prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_VIEW); - RNA_def_property_ui_text(prop, N_("Restrict View"), N_("Restrict visibility in the viewport")); + RNA_def_property_ui_text(prop, "Restrict View", "Restrict visibility in the viewport"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_SELECT); - RNA_def_property_ui_text(prop, N_("Restrict Select"), N_("Restrict selection in the viewport")); + RNA_def_property_ui_text(prop, "Restrict Select", "Restrict selection in the viewport"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 1); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "hide_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_RENDER); - RNA_def_property_ui_text(prop, N_("Restrict Render"), N_("Restrict renderability")); + RNA_def_property_ui_text(prop, "Restrict Render", "Restrict renderability"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); @@ -2164,73 +2163,73 @@ static void rna_def_object(BlenderRNA *brna) // XXX: evil old crap prop= RNA_def_property(srna, "use_slow_parent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "partype", PARSLOW); - RNA_def_property_ui_text(prop, N_("Slow Parent"), N_("Create a delay in the parent relationship")); + RNA_def_property_ui_text(prop, "Slow Parent", "Create a delay in the parent relationship"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dupli_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "transflag"); RNA_def_property_enum_items(prop, dupli_items); - RNA_def_property_ui_text(prop, N_("Dupli Type"), N_("If not None, object duplication method to use")); + RNA_def_property_ui_text(prop, "Dupli Type", "If not None, object duplication method to use"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_dependency_update"); prop= RNA_def_property(srna, "use_dupli_frames_speed", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "transflag", OB_DUPLINOSPEED); - RNA_def_property_ui_text(prop, N_("Dupli Frames Speed"), N_("Set dupliframes to use the frame")); // TODO, better descriptio! + RNA_def_property_ui_text(prop, "Dupli Frames Speed", "Set dupliframes to use the frame"); // TODO, better descriptio! RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "use_dupli_vertices_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIROT); - RNA_def_property_ui_text(prop, N_("Dupli Verts Rotation"), N_("Rotate dupli according to vertex normal")); + RNA_def_property_ui_text(prop, "Dupli Verts Rotation", "Rotate dupli according to vertex normal"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "use_dupli_faces_scale", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIFACES_SCALE); - RNA_def_property_ui_text(prop, N_("Dupli Faces Inherit Scale"), N_("Scale dupli based on face size")); + RNA_def_property_ui_text(prop, "Dupli Faces Inherit Scale", "Scale dupli based on face size"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dupli_faces_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "dupfacesca"); RNA_def_property_range(prop, 0.001f, 10000.0f); - RNA_def_property_ui_text(prop, N_("Dupli Faces Scale"), N_("Scale the DupliFace objects")); + RNA_def_property_ui_text(prop, "Dupli Faces Scale", "Scale the DupliFace objects"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "dupli_group", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "dup_group"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, NULL, "rna_Object_dup_group_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Dupli Group"), N_("Instance an existing group")); + RNA_def_property_ui_text(prop, "Dupli Group", "Instance an existing group"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_dependency_update"); prop= RNA_def_property(srna, "dupli_frames_start", PROP_INT, PROP_NONE|PROP_UNIT_TIME); RNA_def_property_int_sdna(prop, NULL, "dupsta"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); - RNA_def_property_ui_text(prop, N_("Dupli Frames Start"), N_("Start frame for DupliFrames")); + RNA_def_property_ui_text(prop, "Dupli Frames Start", "Start frame for DupliFrames"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dupli_frames_end", PROP_INT, PROP_NONE|PROP_UNIT_TIME); RNA_def_property_int_sdna(prop, NULL, "dupend"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); - RNA_def_property_ui_text(prop, N_("Dupli Frames End"), N_("End frame for DupliFrames")); + RNA_def_property_ui_text(prop, "Dupli Frames End", "End frame for DupliFrames"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dupli_frames_on", PROP_INT, PROP_NONE|PROP_UNIT_TIME); RNA_def_property_int_sdna(prop, NULL, "dupon"); RNA_def_property_range(prop, MINFRAME, MAXFRAME); RNA_def_property_ui_range(prop, 1, 1500, 1, 0); - RNA_def_property_ui_text(prop, N_("Dupli Frames On"), N_("Number of frames to use between DupOff frames")); + RNA_def_property_ui_text(prop, "Dupli Frames On", "Number of frames to use between DupOff frames"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dupli_frames_off", PROP_INT, PROP_NONE|PROP_UNIT_TIME); RNA_def_property_int_sdna(prop, NULL, "dupoff"); RNA_def_property_range(prop, 0, MAXFRAME); RNA_def_property_ui_range(prop, 0, 1500, 1, 0); - RNA_def_property_ui_text(prop, N_("Dupli Frames Off"), N_("Recurring frames to exclude from the Dupliframes")); + RNA_def_property_ui_text(prop, "Dupli Frames Off", "Recurring frames to exclude from the Dupliframes"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); prop= RNA_def_property(srna, "dupli_list", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "duplilist", NULL); RNA_def_property_struct_type(prop, "DupliObject"); - RNA_def_property_ui_text(prop, N_("Dupli list"), N_("Object duplis")); + RNA_def_property_ui_text(prop, "Dupli list", "Object duplis"); prop= RNA_def_property(srna, "is_duplicator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLI); @@ -2240,74 +2239,74 @@ static void rna_def_object(BlenderRNA *brna) prop= RNA_def_property(srna, "time_offset", PROP_FLOAT, PROP_NONE|PROP_UNIT_TIME); RNA_def_property_float_sdna(prop, NULL, "sf"); RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF); - RNA_def_property_ui_text(prop, N_("Time Offset"), N_("Animation offset in frames for F-Curve and dupligroup instances")); + RNA_def_property_ui_text(prop, "Time Offset", "Animation offset in frames for F-Curve and dupligroup instances"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "use_time_offset_edit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_OB); - RNA_def_property_ui_text(prop, N_("Time Offset Edit"), N_("Use time offset when inserting keys and display time offset for F-Curve and action views")); + RNA_def_property_ui_text(prop, "Time Offset Edit", "Use time offset when inserting keys and display time offset for F-Curve and action views"); prop= RNA_def_property(srna, "use_time_offset_parent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_PARENT); - RNA_def_property_ui_text(prop, N_("Time Offset Parent"), N_("Apply the time offset to this objects parent relationship")); + RNA_def_property_ui_text(prop, "Time Offset Parent", "Apply the time offset to this objects parent relationship"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "use_time_offset_particle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_PARTICLE); - RNA_def_property_ui_text(prop, N_("Time Offset Particle"), N_("Let the time offset work on the particle effect")); + RNA_def_property_ui_text(prop, "Time Offset Particle", "Let the time offset work on the particle effect"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); prop= RNA_def_property(srna, "use_time_offset_add_parent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_PARENTADD); - RNA_def_property_ui_text(prop, N_("Time Offset Add Parent"), N_("Add the parents time offset value")); + RNA_def_property_ui_text(prop, "Time Offset Add Parent", "Add the parents time offset value"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); /* drawing */ prop= RNA_def_property(srna, "draw_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt"); RNA_def_property_enum_items(prop, drawtype_items); - RNA_def_property_ui_text(prop, N_("Maximum Draw Type"), N_("Maximum draw type to display object with in viewport")); + RNA_def_property_ui_text(prop, "Maximum Draw Type", "Maximum draw type to display object with in viewport"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_bounds", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_BOUNDBOX); - RNA_def_property_ui_text(prop, N_("Draw Bounds"), N_("Displays the object's bounds")); + RNA_def_property_ui_text(prop, "Draw Bounds", "Displays the object's bounds"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "draw_bounds_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "boundtype"); RNA_def_property_enum_items(prop, boundtype_items); - RNA_def_property_ui_text(prop, N_("Draw Bounds Type"), N_("Object boundary display type")); + RNA_def_property_ui_text(prop, "Draw Bounds Type", "Object boundary display type"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_name", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWNAME); - RNA_def_property_ui_text(prop, N_("Draw Name"), N_("Displays the object's name")); + RNA_def_property_ui_text(prop, "Draw Name", "Displays the object's name"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_axis", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_AXIS); - RNA_def_property_ui_text(prop, N_("Draw Axis"), N_("Displays the object's origin and axis")); + RNA_def_property_ui_text(prop, "Draw Axis", "Displays the object's origin and axis"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_texture_space", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_TEXSPACE); - RNA_def_property_ui_text(prop, N_("Draw Texture Space"), N_("Displays the object's texture space")); + RNA_def_property_ui_text(prop, "Draw Texture Space", "Displays the object's texture space"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_wire", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWWIRE); - RNA_def_property_ui_text(prop, N_("Draw Wire"), N_("Adds the object's wireframe over solid drawing")); + RNA_def_property_ui_text(prop, "Draw Wire", "Adds the object's wireframe over solid drawing"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_transparent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWTRANSP); - RNA_def_property_ui_text(prop, N_("Draw Transparent"), N_("Displays material transparency in the object")); + RNA_def_property_ui_text(prop, "Draw Transparent", "Displays material transparency in the object (unsupported for duplicator drawing)"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_x_ray", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWXRAY); - RNA_def_property_ui_text(prop, N_("X-Ray"), N_("Makes the object draw in front of others")); + RNA_def_property_ui_text(prop, "X-Ray", "Makes the object draw in front of others (unsupported for duplicator drawing)"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); /* Grease Pencil */ @@ -2315,7 +2314,7 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "gpd"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "GreasePencil"); - RNA_def_property_ui_text(prop, N_("Grease Pencil Data"), N_("Grease Pencil datablock")); + RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); /* pose */ @@ -2323,36 +2322,36 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "poselib"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "Action"); - RNA_def_property_ui_text(prop, N_("Pose Library"), N_("Action used as a pose library for armatures")); + RNA_def_property_ui_text(prop, "Pose Library", "Action used as a pose library for armatures"); prop= RNA_def_property(srna, "pose", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "pose"); RNA_def_property_struct_type(prop, "Pose"); - RNA_def_property_ui_text(prop, N_("Pose"), N_("Current pose for armatures")); + RNA_def_property_ui_text(prop, "Pose", "Current pose for armatures"); /* shape keys */ prop= RNA_def_property(srna, "show_only_shape_key", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shapeflag", OB_SHAPE_LOCK); - RNA_def_property_ui_text(prop, N_("Shape Key Lock"), N_("Always show the current Shape for this Object")); + RNA_def_property_ui_text(prop, "Shape Key Lock", "Always show the current Shape for this Object"); RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1); RNA_def_property_update(prop, 0, "rna_Object_internal_update_data"); prop= RNA_def_property(srna, "use_shape_key_edit_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shapeflag", OB_SHAPE_EDIT_MODE); - RNA_def_property_ui_text(prop, N_("Shape Key Edit Mode"), N_("Apply shape keys in edit mode (for Meshes only)")); + RNA_def_property_ui_text(prop, "Shape Key Edit Mode", "Apply shape keys in edit mode (for Meshes only)"); RNA_def_property_ui_icon(prop, ICON_EDITMODE_HLT, 0); RNA_def_property_update(prop, 0, "rna_Object_internal_update_data"); prop= RNA_def_property(srna, "active_shape_key", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "ShapeKey"); RNA_def_property_pointer_funcs(prop, "rna_Object_active_shape_key_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, N_("Active Shape Key"), N_("Current shape key")); + RNA_def_property_ui_text(prop, "Active Shape Key", "Current shape key"); prop= RNA_def_property(srna, "active_shape_key_index", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "shapenr"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); // XXX this is really unpredictable... RNA_def_property_int_funcs(prop, "rna_Object_active_shape_key_index_get", "rna_Object_active_shape_key_index_set", "rna_Object_active_shape_key_index_range"); - RNA_def_property_ui_text(prop, N_("Active Shape Key Index"), N_("Current shape key index")); + RNA_def_property_ui_text(prop, "Active Shape Key Index", "Current shape key index"); RNA_def_property_update(prop, 0, "rna_Object_active_shape_update"); RNA_api_object(srna); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index eb21e419083..490d9c38840 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -33,8 +33,6 @@ #include "rna_internal.h" -#include "BLF_api.h" - #include "DNA_cloth_types.h" #include "DNA_object_types.h" #include "DNA_object_force.h" @@ -1049,19 +1047,19 @@ static void rna_def_field(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem field_type_items[] = { - {0, "NONE", 0, N_("None"), ""}, - {PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, N_("Force"), N_("Gives a radial field toward the center of object")}, - {PFIELD_WIND, "WIND", ICON_FORCE_WIND, N_("Wind"), N_("Gives a constant force along the force objects local Z axis")}, - {PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, N_("Vortex"), N_("Gives a spiraling force that twists the force objects local Z axis")}, - {PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, N_("Magnetic"), N_("Forcefield depends on the speed of the particles")}, - {PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, N_("Harmonic"), N_("The source of this force field is the zero point of a harmonic oscillator")}, - {PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, N_("Charge"), N_("Spherical forcefield based on the charge of particles, only influences other charge force fields")}, - {PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, N_("Lennard-Jones"), N_("Forcefield based on the Lennard-Jones potential")}, - {PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, N_("Texture"), N_("Forcefield based on a texture")}, - {PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, N_("Curve Guide"), N_("Creates a force along a curve object")}, - {PFIELD_BOID, "BOID", ICON_FORCE_BOID, N_("Boid"), ""}, - {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, N_("Turbulence"), N_("Creates turbulence with a noise field")}, - {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, N_("Drag"), N_("Creates a force that dampens motion")}, + {0, "NONE", 0, "None", ""}, + {PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, "Force", "Gives a radial field toward the center of object"}, + {PFIELD_WIND, "WIND", ICON_FORCE_WIND, "Wind", "Gives a constant force along the force objects local Z axis"}, + {PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, "Vortex", "Gives a spiraling force that twists the force objects local Z axis"}, + {PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, "Magnetic", "Forcefield depends on the speed of the particles"}, + {PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, "Harmonic", "The source of this force field is the zero point of a harmonic oscillator"}, + {PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, "Charge", "Spherical forcefield based on the charge of particles, only influences other charge force fields"}, + {PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, "Lennard-Jones", "Forcefield based on the Lennard-Jones potential"}, + {PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, "Texture", "Forcefield based on a texture"}, + {PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, "Curve Guide", "Creates a force along a curve object"}, + {PFIELD_BOID, "BOID", ICON_FORCE_BOID, "Boid", ""}, + {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, "Turbulence", "Creates turbulence with a noise field"}, + {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, "Drag", "Creates a force that dampens motion"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem falloff_items[] = { diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 108fbf2cbb0..77fa975761f 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -37,8 +37,6 @@ #include "rna_internal.h" -#include "BLF_api.h" - #include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" @@ -1220,11 +1218,11 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem texco_items[] = { - {TEXCO_GLOB, "GLOBAL", 0, N_("Global"), N_("Uses global coordinates for the texture coordinates")}, - {TEXCO_OBJECT, "OBJECT", 0, N_("Object"), N_("Uses linked object's coordinates for texture coordinates")}, - {TEXCO_UV, "UV", 0, "UV", N_("Uses UV coordinates for texture coordinates")}, - {TEXCO_ORCO, "ORCO", 0, N_("Generated"), N_("Uses the original undeformed coordinates of the object")}, - {TEXCO_STRAND, "STRAND", 0, N_("Strand / Particle"), N_("Uses normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)")}, + {TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates"}, + {TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates"}, + {TEXCO_UV, "UV", 0, "UV", "Uses UV coordinates for texture coordinates"}, + {TEXCO_ORCO, "ORCO", 0, "Generated", "Uses the original undeformed coordinates of the object"}, + {TEXCO_STRAND, "STRAND", 0, "Strand / Particle", "Uses normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_mapping_items[] = { diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 4c6b8d10aea..e3e3296cb70 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -36,8 +36,6 @@ #include "rna_internal.h" -#include "BLF_api.h" - #include "RE_pipeline.h" #include "BKE_utildefines.h" @@ -54,10 +52,10 @@ /* RenderEngine */ static RenderEngineType internal_render_type = { - NULL, NULL, "BLENDER_RENDER", N_("Blender Render"), RE_INTERNAL, NULL, {NULL, NULL, NULL, NULL}}; + NULL, NULL, "BLENDER_RENDER", "Blender Render", RE_INTERNAL, NULL, {NULL, NULL, NULL, NULL}}; #ifdef WITH_GAMEENGINE static RenderEngineType internal_game_type = { - NULL, NULL, "BLENDER_GAME", N_("Blender Game"), RE_INTERNAL|RE_GAME, NULL, {NULL, NULL, NULL, NULL}}; + NULL, NULL, "BLENDER_GAME", "Blender Game", RE_INTERNAL|RE_GAME, NULL, {NULL, NULL, NULL, NULL}}; #endif ListBase R_engines = {NULL, NULL}; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ae9576d1789..197ddd2ba06 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -61,7 +61,6 @@ #include "WM_types.h" #include "BLI_threads.h" -#include "BLF_api.h" EnumPropertyItem snap_target_items[] = { {SCE_SNAP_TARGET_CLOSEST, "CLOSEST", 0, "Closest", "Snap closest point onto target"}, @@ -1218,7 +1217,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) /* Grease Pencil */ prop = RNA_def_property(srna, "use_grease_pencil_sessions", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gpencil_flags", GP_TOOL_FLAG_PAINTSESSIONS_ON); - RNA_def_property_ui_text(prop, N_("Use Sketching Sessions"), N_("Allow drawing multiple strokes at a time with Grease Pencil")); + RNA_def_property_ui_text(prop, "Use Sketching Sessions", "Allow drawing multiple strokes at a time with Grease Pencil"); RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); // xxx: need toolbar to be redrawn... /* Auto Keying */ @@ -1363,39 +1362,39 @@ static void rna_def_unit_settings(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem unit_systems[] = { - {USER_UNIT_NONE, "NONE", 0, N_("None"), ""}, - {USER_UNIT_METRIC, "METRIC", 0, N_("Metric"), ""}, - {USER_UNIT_IMPERIAL, "IMPERIAL", 0, N_("Imperial"), ""}, + {USER_UNIT_NONE, "NONE", 0, "None", ""}, + {USER_UNIT_METRIC, "METRIC", 0, "Metric", ""}, + {USER_UNIT_IMPERIAL, "IMPERIAL", 0, "Imperial", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem rotation_units[] = { - {0, "DEGREES", 0, N_("Degrees"), N_("Use degrees for measuring rotation")}, - {USER_UNIT_ROT_RADIANS, "RADIANS", 0, N_("Radians"), ""}, + {0, "DEGREES", 0, "Degrees", "Use degrees for measuring rotation"}, + {USER_UNIT_ROT_RADIANS, "RADIANS", 0, "Radians", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "UnitSettings", NULL); - RNA_def_struct_ui_text(srna, N_("Unit Settings"), ""); + RNA_def_struct_ui_text(srna, "Unit Settings", ""); /* Units */ prop= RNA_def_property(srna, "system", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, unit_systems); - RNA_def_property_ui_text(prop, N_("Unit System"), N_("The unit system to use for button display")); + RNA_def_property_ui_text(prop, "Unit System", "The unit system to use for button display"); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "system_rotation", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, rotation_units); - RNA_def_property_ui_text(prop, N_("Rotation Units"), N_("Unit to use for displaying/editing rotation values")); + RNA_def_property_ui_text(prop, "Rotation Units", "Unit to use for displaying/editing rotation values"); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "scale_length", PROP_FLOAT, PROP_UNSIGNED); - RNA_def_property_ui_text(prop, N_("Unit Scale"), N_("Scale to use when converting between blender units and dimensions")); + RNA_def_property_ui_text(prop, "Unit Scale", "Scale to use when converting between blender units and dimensions"); RNA_def_property_range(prop, 0.00001, 100000.0); RNA_def_property_ui_range(prop, 0.001, 100.0, 0.1, 3); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "use_separate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_UNIT_OPT_SPLIT); - RNA_def_property_ui_text(prop, N_("Separate Units"), N_("Display units in pairs")); + RNA_def_property_ui_text(prop, "Separate Units", "Display units in pairs"); RNA_def_property_update(prop, NC_WINDOW, NULL); } @@ -1406,7 +1405,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); if(scene) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SceneRenderLayer_name_set"); else RNA_def_property_string_sdna(prop, NULL, "name"); - RNA_def_property_ui_text(prop, N_("Name"), N_("Render layer name")); + RNA_def_property_ui_text(prop, "Name", "Render layer name"); RNA_def_struct_name_property(srna, prop); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1415,7 +1414,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) RNA_def_property_pointer_sdna(prop, NULL, "mat_override"); RNA_def_property_struct_type(prop, "Material"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Material Override"), N_("Material to override all other materials in this render layer")); + RNA_def_property_ui_text(prop, "Material Override", "Material to override all other materials in this render layer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1423,7 +1422,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) RNA_def_property_pointer_sdna(prop, NULL, "light_override"); RNA_def_property_struct_type(prop, "Group"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Light Override"), N_("Group to override all other lights in this render layer")); + RNA_def_property_ui_text(prop, "Light Override", "Group to override all other lights in this render layer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1431,7 +1430,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "lay", 1); RNA_def_property_array(prop, 20); - RNA_def_property_ui_text(prop, N_("Visible Layers"), N_("Scene layers included in this render layer")); + RNA_def_property_ui_text(prop, "Visible Layers", "Scene layers included in this render layer"); if(scene) RNA_def_property_boolean_funcs(prop, NULL, "rna_SceneRenderLayer_layer_set"); else RNA_def_property_boolean_funcs(prop, NULL, "rna_RenderLayer_layer_set"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -1440,232 +1439,232 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop= RNA_def_property(srna, "layers_zmask", PROP_BOOLEAN, PROP_LAYER); RNA_def_property_boolean_sdna(prop, NULL, "lay_zmask", 1); RNA_def_property_array(prop, 20); - RNA_def_property_ui_text(prop, N_("Zmask Layers"), N_("Zmask scene layers for solid faces")); + RNA_def_property_ui_text(prop, "Zmask Layers", "Zmask scene layers for solid faces"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* layer options */ prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "layflag", SCE_LAY_DISABLE); - RNA_def_property_ui_text(prop, N_("Enabled"), N_("Disable or enable the render layer")); + RNA_def_property_ui_text(prop, "Enabled", "Disable or enable the render layer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_zmask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZMASK); - RNA_def_property_ui_text(prop, N_("Zmask"), N_("Only render what's in front of the solid z values")); + RNA_def_property_ui_text(prop, "Zmask", "Only render what's in front of the solid z values"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "invert_zmask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_NEG_ZMASK); - RNA_def_property_ui_text(prop, N_("Zmask Negate"), N_("For Zmask, only render what is behind solid z values instead of in front")); + RNA_def_property_ui_text(prop, "Zmask Negate", "For Zmask, only render what is behind solid z values instead of in front"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_all_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ALL_Z); - RNA_def_property_ui_text(prop, N_("All Z"), N_("Fill in Z values for solid faces in invisible layers, for masking")); + RNA_def_property_ui_text(prop, "All Z", "Fill in Z values for solid faces in invisible layers, for masking"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_solid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_SOLID); - RNA_def_property_ui_text(prop, N_("Solid"), N_("Render Solid faces in this Layer")); + RNA_def_property_ui_text(prop, "Solid", "Render Solid faces in this Layer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_halo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_HALO); - RNA_def_property_ui_text(prop, N_("Halo"), N_("Render Halos in this Layer (on top of Solid)")); + RNA_def_property_ui_text(prop, "Halo", "Render Halos in this Layer (on top of Solid)"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_ztransp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZTRA); - RNA_def_property_ui_text(prop, N_("ZTransp"), N_("Render Z-Transparent faces in this Layer (On top of Solid and Halos)")); + RNA_def_property_ui_text(prop, "ZTransp", "Render Z-Transparent faces in this Layer (On top of Solid and Halos)"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_sky", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_SKY); - RNA_def_property_ui_text(prop, N_("Sky"), N_("Render Sky in this Layer")); + RNA_def_property_ui_text(prop, "Sky", "Render Sky in this Layer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_edge_enhance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_EDGE); - RNA_def_property_ui_text(prop, N_("Edge"), N_("Render Edge-enhance in this Layer (only works for Solid faces)")); + RNA_def_property_ui_text(prop, "Edge", "Render Edge-enhance in this Layer (only works for Solid faces)"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_strand", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_STRAND); - RNA_def_property_ui_text(prop, N_("Strand"), N_("Render Strands in this Layer")); + RNA_def_property_ui_text(prop, "Strand", "Render Strands in this Layer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* passes */ prop= RNA_def_property(srna, "use_pass_combined", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_COMBINED); - RNA_def_property_ui_text(prop, N_("Combined"), N_("Deliver full combined RGBA buffer")); + RNA_def_property_ui_text(prop, "Combined", "Deliver full combined RGBA buffer"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_Z); - RNA_def_property_ui_text(prop, "Z", N_("Deliver Z values pass")); + RNA_def_property_ui_text(prop, "Z", "Deliver Z values pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_vector", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_VECTOR); - RNA_def_property_ui_text(prop, N_("Vector"), N_("Deliver speed vector pass")); + RNA_def_property_ui_text(prop, "Vector", "Deliver speed vector pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_NORMAL); - RNA_def_property_ui_text(prop, N_("Normal"), N_("Deliver normal pass")); + RNA_def_property_ui_text(prop, "Normal", "Deliver normal pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_UV); - RNA_def_property_ui_text(prop, "UV", N_("Deliver texture UV pass")); + RNA_def_property_ui_text(prop, "UV", "Deliver texture UV pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_mist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_MIST); - RNA_def_property_ui_text(prop, N_("Mist"), N_("Deliver mist factor pass (0.0-1.0)")); + RNA_def_property_ui_text(prop, "Mist", "Deliver mist factor pass (0.0-1.0)"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_object_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXOB); - RNA_def_property_ui_text(prop, N_("Object Index"), N_("Deliver object index pass")); + RNA_def_property_ui_text(prop, "Object Index", "Deliver object index pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_material_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXMA); - RNA_def_property_ui_text(prop, N_("Material Index"), N_("Deliver material index pass")); + RNA_def_property_ui_text(prop, "Material Index", "Deliver material index pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_RGBA); - RNA_def_property_ui_text(prop, N_("Color"), N_("Deliver shade-less color pass")); + RNA_def_property_ui_text(prop, "Color", "Deliver shade-less color pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE); - RNA_def_property_ui_text(prop, N_("Diffuse"), N_("Deliver diffuse pass")); + RNA_def_property_ui_text(prop, "Diffuse", "Deliver diffuse pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SPEC); - RNA_def_property_ui_text(prop, N_("Specular"), N_("Deliver specular pass")); + RNA_def_property_ui_text(prop, "Specular", "Deliver specular pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SHADOW); - RNA_def_property_ui_text(prop, N_("Shadow"), N_("Deliver shadow pass")); + RNA_def_property_ui_text(prop, "Shadow", "Deliver shadow pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_AO); - RNA_def_property_ui_text(prop, "AO", N_("Deliver AO pass")); + RNA_def_property_ui_text(prop, "AO", "Deliver AO pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFLECT); - RNA_def_property_ui_text(prop, N_("Reflection"), N_("Deliver raytraced reflection pass")); + RNA_def_property_ui_text(prop, "Reflection", "Deliver raytraced reflection pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFRACT); - RNA_def_property_ui_text(prop, N_("Refraction"), N_("Deliver raytraced refraction pass")); + RNA_def_property_ui_text(prop, "Refraction", "Deliver raytraced refraction pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_EMIT); - RNA_def_property_ui_text(prop, N_("Emit"), N_("Deliver emission pass")); + RNA_def_property_ui_text(prop, "Emit", "Deliver emission pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_ENVIRONMENT); - RNA_def_property_ui_text(prop, N_("Environment"), N_("Deliver environment lighting pass")); + RNA_def_property_ui_text(prop, "Environment", "Deliver environment lighting pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDIRECT); - RNA_def_property_ui_text(prop, N_("Indirect"), N_("Deliver indirect lighting pass")); + RNA_def_property_ui_text(prop, "Indirect", "Deliver indirect lighting pass"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SPEC); - RNA_def_property_ui_text(prop, N_("Specular Exclude"), N_("Exclude specular pass from combined")); + RNA_def_property_ui_text(prop, "Specular Exclude", "Exclude specular pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SHADOW); - RNA_def_property_ui_text(prop, N_("Shadow Exclude"), N_("Exclude shadow pass from combined")); + RNA_def_property_ui_text(prop, "Shadow Exclude", "Exclude shadow pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_AO); - RNA_def_property_ui_text(prop, N_("AO Exclude"), N_("Exclude AO pass from combined")); + RNA_def_property_ui_text(prop, "AO Exclude", "Exclude AO pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFLECT); - RNA_def_property_ui_text(prop, N_("Reflection Exclude"), N_("Exclude raytraced reflection pass from combined")); + RNA_def_property_ui_text(prop, "Reflection Exclude", "Exclude raytraced reflection pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFRACT); - RNA_def_property_ui_text(prop, N_("Refraction Exclude"), N_("Exclude raytraced refraction pass from combined")); + RNA_def_property_ui_text(prop, "Refraction Exclude", "Exclude raytraced refraction pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_EMIT); - RNA_def_property_ui_text(prop, N_("Emit Exclude"), N_("Exclude emission pass from combined")); + RNA_def_property_ui_text(prop, "Emit Exclude", "Exclude emission pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_ENVIRONMENT); - RNA_def_property_ui_text(prop, N_("Environment Exclude"), N_("Exclude environment pass from combined")); + RNA_def_property_ui_text(prop, "Environment Exclude", "Exclude environment pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_INDIRECT); - RNA_def_property_ui_text(prop, N_("Indirect Exclude"), N_("Exclude indirect pass from combined")); + RNA_def_property_ui_text(prop, "Indirect Exclude", "Exclude indirect pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -2143,55 +2142,55 @@ static void rna_def_scene_render_data(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem pixel_filter_items[] ={ - {R_FILTER_BOX, "BOX", 0, N_("Box"), N_("Use a box filter for anti-aliasing")}, - {R_FILTER_TENT, "TENT", 0, N_("Tent"), N_("Use a tent filter for anti-aliasing")}, - {R_FILTER_QUAD, "QUADRATIC", 0, N_("Quadratic"), N_("Use a quadratic filter for anti-aliasing")}, - {R_FILTER_CUBIC, "CUBIC", 0, N_("Cubic"), N_("Use a cubic filter for anti-aliasing")}, - {R_FILTER_CATROM, "CATMULLROM", 0, N_("Catmull-Rom"), N_("Use a Catmull-Rom filter for anti-aliasing")}, - {R_FILTER_GAUSS, "GAUSSIAN", 0, N_("Gaussian"), N_("Use a Gaussian filter for anti-aliasing")}, - {R_FILTER_MITCH, "MITCHELL", 0, N_("Mitchell-Netravali"), N_("Use a Mitchell-Netravali filter for anti-aliasing")}, + {R_FILTER_BOX, "BOX", 0, "Box", "Use a box filter for anti-aliasing"}, + {R_FILTER_TENT, "TENT", 0, "Tent", "Use a tent filter for anti-aliasing"}, + {R_FILTER_QUAD, "QUADRATIC", 0, "Quadratic", "Use a quadratic filter for anti-aliasing"}, + {R_FILTER_CUBIC, "CUBIC", 0, "Cubic", "Use a cubic filter for anti-aliasing"}, + {R_FILTER_CATROM, "CATMULLROM", 0, "Catmull-Rom", "Use a Catmull-Rom filter for anti-aliasing"}, + {R_FILTER_GAUSS, "GAUSSIAN", 0, "Gaussian", "Use a Gaussian filter for anti-aliasing"}, + {R_FILTER_MITCH, "MITCHELL", 0, "Mitchell-Netravali", "Use a Mitchell-Netravali filter for anti-aliasing"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem alpha_mode_items[] ={ - {R_ADDSKY, "SKY", 0, N_("Sky"), N_("Transparent pixels are filled with sky color")}, - {R_ALPHAPREMUL, "PREMUL", 0, N_("Premultiplied"), N_("Transparent RGB pixels are multiplied by the alpha channel")}, - {R_ALPHAKEY, "STRAIGHT", 0, N_("Straight Alpha"), N_("Transparent RGB and alpha pixels are unmodified")}, + {R_ADDSKY, "SKY", 0, "Sky", "Transparent pixels are filled with sky color"}, + {R_ALPHAPREMUL, "PREMUL", 0, "Premultiplied", "Transparent RGB pixels are multiplied by the alpha channel"}, + {R_ALPHAKEY, "STRAIGHT", 0, "Straight Alpha", "Transparent RGB and alpha pixels are unmodified"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem display_mode_items[] ={ - {R_OUTPUT_SCREEN, "SCREEN", 0, N_("Full Screen"), N_("Images are rendered in full Screen")}, - {R_OUTPUT_AREA, "AREA", 0, N_("Image Editor"), N_("Images are rendered in Image Editor")}, - {R_OUTPUT_WINDOW, "WINDOW", 0, N_("New Window"), N_("Images are rendered in new Window")}, - {R_OUTPUT_NONE, "NONE", 0, N_("Keep UI"), N_("Images are rendered without forcing UI changes, optionally showing result")}, + {R_OUTPUT_SCREEN, "SCREEN", 0, "Full Screen", "Images are rendered in full Screen"}, + {R_OUTPUT_AREA, "AREA", 0, "Image Editor", "Images are rendered in Image Editor"}, + {R_OUTPUT_WINDOW, "WINDOW", 0, "New Window", "Images are rendered in new Window"}, + {R_OUTPUT_NONE, "NONE", 0, "Keep UI", "Images are rendered without forcing UI changes, optionally showing result"}, {0, NULL, 0, NULL, NULL}}; /* Bake */ static EnumPropertyItem bake_mode_items[] ={ - {RE_BAKE_ALL, "FULL", 0, N_("Full Render"), N_("Bake everything")}, - {RE_BAKE_AO, "AO", 0, N_("Ambient Occlusion"), N_("Bake ambient occlusion")}, - {RE_BAKE_SHADOW, "SHADOW", 0, N_("Shadow"), N_("Bake shadows")}, - {RE_BAKE_NORMALS, "NORMALS", 0, N_("Normals"), N_("Bake normals")}, - {RE_BAKE_TEXTURE, "TEXTURE", 0, N_("Textures"), N_("Bake textures")}, - {RE_BAKE_DISPLACEMENT, "DISPLACEMENT", 0, N_("Displacement"), N_("Bake displacement")}, - {RE_BAKE_EMIT, "EMIT", 0, N_("Emission"), N_("Bake Emit values (glow)")}, - {RE_BAKE_ALPHA, "ALPHA", 0, N_("Alpha"), N_("Bake Alpha values (transparency)")}, - {RE_BAKE_MIRROR_INTENSITY, "MIRROR_INTENSITY", 0, N_("Mirror Intensity"), N_("Bake Mirror values")}, - {RE_BAKE_MIRROR_COLOR, "MIRROR_COLOR", 0, N_("Mirror Colors"), N_("Bake Mirror colors")}, - {RE_BAKE_SPEC_INTENSITY, "SPEC_INTENSITY", 0, N_("Specular Intensity"), N_("Bake Specular values")}, - {RE_BAKE_SPEC_COLOR, "SPEC_COLOR", 0, N_("Specular Colors"), N_("Bake Specular colors")}, + {RE_BAKE_ALL, "FULL", 0, "Full Render", "Bake everything"}, + {RE_BAKE_AO, "AO", 0, "Ambient Occlusion", "Bake ambient occlusion"}, + {RE_BAKE_SHADOW, "SHADOW", 0, "Shadow", "Bake shadows"}, + {RE_BAKE_NORMALS, "NORMALS", 0, "Normals", "Bake normals"}, + {RE_BAKE_TEXTURE, "TEXTURE", 0, "Textures", "Bake textures"}, + {RE_BAKE_DISPLACEMENT, "DISPLACEMENT", 0, "Displacement", "Bake displacement"}, + {RE_BAKE_EMIT, "EMIT", 0, "Emission", "Bake Emit values (glow)"}, + {RE_BAKE_ALPHA, "ALPHA", 0, "Alpha", "Bake Alpha values (transparency)"}, + {RE_BAKE_MIRROR_INTENSITY, "MIRROR_INTENSITY", 0, "Mirror Intensity", "Bake Mirror values"}, + {RE_BAKE_MIRROR_COLOR, "MIRROR_COLOR", 0, "Mirror Colors", "Bake Mirror colors"}, + {RE_BAKE_SPEC_INTENSITY, "SPEC_INTENSITY", 0, "Specular Intensity", "Bake Specular values"}, + {RE_BAKE_SPEC_COLOR, "SPEC_COLOR", 0, "Specular Colors", "Bake Specular colors"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem bake_normal_space_items[] ={ - {R_BAKE_SPACE_CAMERA, "CAMERA", 0, N_("Camera"), N_("Bake the normals in camera space")}, - {R_BAKE_SPACE_WORLD, "WORLD", 0, N_("World"), N_("Bake the normals in world space")}, - {R_BAKE_SPACE_OBJECT, "OBJECT", 0, N_("Object"), N_("Bake the normals in object space")}, - {R_BAKE_SPACE_TANGENT, "TANGENT", 0, N_("Tangent"), N_("Bake the normals in tangent space")}, + {R_BAKE_SPACE_CAMERA, "CAMERA", 0, "Camera", "Bake the normals in camera space"}, + {R_BAKE_SPACE_WORLD, "WORLD", 0, "World", "Bake the normals in world space"}, + {R_BAKE_SPACE_OBJECT, "OBJECT", 0, "Object", "Bake the normals in object space"}, + {R_BAKE_SPACE_TANGENT, "TANGENT", 0, "Tangent", "Bake the normals in tangent space"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem bake_qyad_split_items[] ={ - {0, "AUTO", 0, N_("Automatic"), N_("Split quads to give the least distortion while baking")}, - {1, "FIXED", 0, N_("Fixed"), N_("Split quads predictably (0,1,2) (0,2,3)")}, - {2, "FIXED_ALT", 0, N_("Fixed Alternate"), N_("Split quads predictably (1,2,3) (1,3,0)")}, + {0, "AUTO", 0, "Automatic", "Split quads to give the least distortion while baking"}, + {1, "FIXED", 0, "Fixed", "Split quads predictably (0,1,2) (0,2,3)"}, + {2, "FIXED_ALT", 0, "Fixed Alternate", "Split quads predictably (1,2,3) (1,3,0)"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem octree_resolution_items[] = { @@ -2202,12 +2201,12 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem raytrace_structure_items[] = { - {R_RAYSTRUCTURE_AUTO, "AUTO", 0, N_("Auto"), N_("Automatically select acceleration structure")}, - {R_RAYSTRUCTURE_OCTREE, "OCTREE", 0, N_("Octree"), N_("Use old Octree structure")}, - {R_RAYSTRUCTURE_BLIBVH, "BLIBVH", 0, "BLI BVH", N_("Use BLI K-Dop BVH.c")}, - {R_RAYSTRUCTURE_VBVH, "VBVH", 0, "vBVH", N_("Use vBVH")}, - {R_RAYSTRUCTURE_SIMD_SVBVH, "SIMD_SVBVH", 0, "SIMD SVBVH", N_("Use SIMD SVBVH")}, - {R_RAYSTRUCTURE_SIMD_QBVH, "SIMD_QBVH", 0, "SIMD QBVH", N_("Use SIMD QBVH")}, + {R_RAYSTRUCTURE_AUTO, "AUTO", 0, "Auto", "Automatically select acceleration structure"}, + {R_RAYSTRUCTURE_OCTREE, "OCTREE", 0, "Octree", "Use old Octree structure"}, + {R_RAYSTRUCTURE_BLIBVH, "BLIBVH", 0, "BLI BVH", "Use BLI K-Dop BVH.c"}, + {R_RAYSTRUCTURE_VBVH, "VBVH", 0, "vBVH", "Use vBVH"}, + {R_RAYSTRUCTURE_SIMD_SVBVH, "SIMD_SVBVH", 0, "SIMD SVBVH", "Use SIMD SVBVH"}, + {R_RAYSTRUCTURE_SIMD_QBVH, "SIMD_QBVH", 0, "SIMD QBVH", "Use SIMD QBVH"}, {0, NULL, 0, NULL, NULL} }; @@ -2219,18 +2218,18 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem field_order_items[] = { - {0, "EVEN_FIRST", 0, N_("Upper First"), N_("Upper field first")}, - {R_ODDFIELD, "ODD_FIRST", 0, N_("Lower First"), N_("Lower field first")}, + {0, "EVEN_FIRST", 0, "Upper First", "Upper field first"}, + {R_ODDFIELD, "ODD_FIRST", 0, "Lower First", "Lower field first"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem threads_mode_items[] = { - {0, "AUTO", 0, N_("Auto-detect"), N_("Automatically determine the number of threads, based on CPUs")}, - {R_FIXED_THREADS, "FIXED", 0, N_("Fixed"), N_("Manually determine the number of threads")}, + {0, "AUTO", 0, "Auto-detect", "Automatically determine the number of threads, based on CPUs"}, + {R_FIXED_THREADS, "FIXED", 0, "Fixed", "Manually determine the number of threads"}, {0, NULL, 0, NULL, NULL}}; #ifdef WITH_OPENEXR static EnumPropertyItem exr_codec_items[] = { - {0, "NONE", 0, N_("None"), ""}, + {0, "NONE", 0, "None", ""}, {1, "PXR24", 0, "Pxr24 (lossy)", ""}, {2, "ZIP", 0, "ZIP (lossless)", ""}, {3, "PIZ", 0, "PIZ (lossless)", ""}, @@ -2240,20 +2239,20 @@ static void rna_def_scene_render_data(BlenderRNA *brna) #ifdef WITH_OPENJPEG static EnumPropertyItem jp2_preset_items[] = { - {0, "NO_PRESET", 0, N_("No Preset"), ""}, - {1, "CINE_24FPS", 0, N_("Cinema 24fps 2048x1080"), ""}, - {2, "CINE_48FPS", 0, N_("Cinema 48fps 2048x1080"), ""}, - {3, "CINE_24FPS_4K", 0, N_("Cinema 24fps 4096x2160"), ""}, - {4, "CINE_SCOPE_24FPS", 0, N_("Cine-Scope 24fps 2048x858"), ""}, - {5, "CINE_SCOPE_48FPS", 0, N_("Cine-Scope 48fps 2048x858"), ""}, - {6, "CINE_FLAT_24FPS", 0, N_("Cine-Flat 24fps 1998x1080"), ""}, - {7, "CINE_FLAT_48FPS", 0, N_("Cine-Flat 48fps 1998x1080"), ""}, + {0, "NO_PRESET", 0, "No Preset", ""}, + {1, "CINE_24FPS", 0, "Cinema 24fps 2048x1080", ""}, + {2, "CINE_48FPS", 0, "Cinema 48fps 2048x1080", ""}, + {3, "CINE_24FPS_4K", 0, "Cinema 24fps 4096x2160", ""}, + {4, "CINE_SCOPE_24FPS", 0, "Cine-Scope 24fps 2048x858", ""}, + {5, "CINE_SCOPE_48FPS", 0, "Cine-Scope 48fps 2048x858", ""}, + {6, "CINE_FLAT_24FPS", 0, "Cine-Flat 24fps 1998x1080", ""}, + {7, "CINE_FLAT_48FPS", 0, "Cine-Flat 48fps 1998x1080", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem jp2_depth_items[] = { - {8, "8", 0, "8", N_("8 bit color channels")}, - {12, "12", 0, "12", N_("12 bit color channels")}, - {16, "16", 0, "16", N_("16 bit color channels")}, + {8, "8", 0, "8", "8 bit color channels"}, + {12, "12", 0, "12", "12 bit color channels"}, + {16, "16", 0, "16", "16 bit color channels"}, {0, NULL, 0, NULL, NULL}}; #endif @@ -2343,62 +2342,62 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem engine_items[] = { - {0, "BLENDER_RENDER", 0, N_("Blender Render"), N_("Use the Blender internal rendering engine for rendering")}, + {0, "BLENDER_RENDER", 0, "Blender Render", "Use the Blender internal rendering engine for rendering"}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "RenderSettings", NULL); RNA_def_struct_sdna(srna, "RenderData"); RNA_def_struct_nested(brna, srna, "Scene"); RNA_def_struct_path_func(srna, "rna_RenderSettings_path"); - RNA_def_struct_ui_text(srna, N_("Render Data"), N_("Rendering settings for a Scene datablock")); + RNA_def_struct_ui_text(srna, "Render Data", "Rendering settings for a Scene datablock"); prop= RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "planes"); RNA_def_property_enum_items(prop, image_color_mode_items); - RNA_def_property_ui_text(prop, N_("Color Mode"), N_("Choose BW for saving greyscale images, RGB for saving red, green and blue channels, AND RGBA for saving red, green, blue + alpha channels")); + RNA_def_property_ui_text(prop, "Color Mode", "Choose BW for saving greyscale images, RGB for saving red, green and blue channels, AND RGBA for saving red, green, blue + alpha channels"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "resolution_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "xsch"); RNA_def_property_range(prop, 4, 10000); - RNA_def_property_ui_text(prop, N_("Resolution X"), N_("Number of horizontal pixels in the rendered image")); + RNA_def_property_ui_text(prop, "Resolution X", "Number of horizontal pixels in the rendered image"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "resolution_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ysch"); RNA_def_property_range(prop, 4, 10000); - RNA_def_property_ui_text(prop, N_("Resolution Y"), N_("Number of vertical pixels in the rendered image")); + RNA_def_property_ui_text(prop, "Resolution Y", "Number of vertical pixels in the rendered image"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "resolution_percentage", PROP_INT, PROP_PERCENTAGE); RNA_def_property_int_sdna(prop, NULL, "size"); RNA_def_property_range(prop, 1, SHRT_MAX); RNA_def_property_ui_range(prop, 1, 100, 10, 1); - RNA_def_property_ui_text(prop, N_("Resolution %"), N_("Percentage scale for render resolution")); + RNA_def_property_ui_text(prop, "Resolution %", "Percentage scale for render resolution"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "parts_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "xparts"); RNA_def_property_range(prop, 1, 512); - RNA_def_property_ui_text(prop, N_("Parts X"), N_("Number of horizontal tiles to use while rendering")); + RNA_def_property_ui_text(prop, "Parts X", "Number of horizontal tiles to use while rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "parts_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "yparts"); RNA_def_property_range(prop, 1, 512); - RNA_def_property_ui_text(prop, N_("Parts Y"), N_("Number of vertical tiles to use while rendering")); + RNA_def_property_ui_text(prop, "Parts Y", "Number of vertical tiles to use while rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "pixel_aspect_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "xasp"); RNA_def_property_range(prop, 1.0f, 200.0f); - RNA_def_property_ui_text(prop, N_("Pixel Aspect X"), N_("Horizontal aspect ratio - for anamorphic or non-square pixel output")); + RNA_def_property_ui_text(prop, "Pixel Aspect X", "Horizontal aspect ratio - for anamorphic or non-square pixel output"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "pixel_aspect_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "yasp"); RNA_def_property_range(prop, 1.0f, 200.0f); - RNA_def_property_ui_text(prop, N_("Pixel Aspect Y"), N_("Vertical aspect ratio - for anamorphic or non-square pixel output")); + RNA_def_property_ui_text(prop, "Pixel Aspect Y", "Vertical aspect ratio - for anamorphic or non-square pixel output"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* JPEG and AVI JPEG */ @@ -2406,39 +2405,39 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "file_quality", PROP_INT, PROP_PERCENTAGE); RNA_def_property_int_sdna(prop, NULL, "quality"); RNA_def_property_range(prop, 0, 100); /* 0 is needed for compression. */ - RNA_def_property_ui_text(prop, N_("Quality"), N_("Quality of JPEG images, AVI Jpeg and SGI movies, Compression for PNG's")); + RNA_def_property_ui_text(prop, "Quality", "Quality of JPEG images, AVI Jpeg and SGI movies, Compression for PNG's"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* Tiff */ prop= RNA_def_property(srna, "use_tiff_16bit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_TIFF_16BIT); - RNA_def_property_ui_text(prop, "16 Bit", N_("Save TIFF with 16 bits per channel")); + RNA_def_property_ui_text(prop, "16 Bit", "Save TIFF with 16 bits per channel"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* Cineon and DPX */ prop= RNA_def_property(srna, "use_cineon_log", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_CINEON_LOG); - RNA_def_property_ui_text(prop, N_("Log"), N_("Convert to logarithmic color space")); + RNA_def_property_ui_text(prop, "Log", "Convert to logarithmic color space"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "cineon_black", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "cineonblack"); RNA_def_property_range(prop, 0, 1024); - RNA_def_property_ui_text(prop, "B", N_("Log conversion reference blackpoint")); + RNA_def_property_ui_text(prop, "B", "Log conversion reference blackpoint"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "cineon_white", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "cineonwhite"); RNA_def_property_range(prop, 0, 1024); - RNA_def_property_ui_text(prop, "W", N_("Log conversion reference whitepoint")); + RNA_def_property_ui_text(prop, "W", "Log conversion reference whitepoint"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "cineon_gamma", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "cineongamma"); RNA_def_property_range(prop, 0.0f, 10.0f); - RNA_def_property_ui_text(prop, "G", N_("Log conversion gamma")); + RNA_def_property_ui_text(prop, "G", "Log conversion gamma"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); #ifdef WITH_OPENEXR @@ -2447,22 +2446,22 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "exr_codec", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "quality"); RNA_def_property_enum_items(prop, exr_codec_items); - RNA_def_property_ui_text(prop, N_("Codec"), N_("Codec settings for OpenEXR")); + RNA_def_property_ui_text(prop, "Codec", "Codec settings for OpenEXR"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_exr_half", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_OPENEXR_HALF); - RNA_def_property_ui_text(prop, N_("Half"), N_("Use 16 bit floats instead of 32 bit floats per channel")); + RNA_def_property_ui_text(prop, "Half", "Use 16 bit floats instead of 32 bit floats per channel"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "exr_zbuf", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_OPENEXR_ZBUF); - RNA_def_property_ui_text(prop, N_("Zbuf"), N_("Save the z-depth per pixel (32 bit unsigned int z-buffer)")); + RNA_def_property_ui_text(prop, "Zbuf", "Save the z-depth per pixel (32 bit unsigned int z-buffer)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "exr_preview", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_PREVIEW_JPG); - RNA_def_property_ui_text(prop, N_("Preview"), N_("When rendering animations, save JPG preview images in same directory")); + RNA_def_property_ui_text(prop, "Preview", "When rendering animations, save JPG preview images in same directory"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); #endif @@ -2473,19 +2472,19 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "jp2_preset"); RNA_def_property_enum_items(prop, jp2_preset_items); RNA_def_property_enum_funcs(prop, NULL, "rna_RenderSettings_jpeg2k_preset_set", NULL); - RNA_def_property_ui_text(prop, N_("Preset"), N_("Use a DCI Standard preset for saving jpeg2000")); + RNA_def_property_ui_text(prop, "Preset", "Use a DCI Standard preset for saving jpeg2000"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "jpeg2k_depth", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "jp2_depth"); RNA_def_property_enum_items(prop, jp2_depth_items); RNA_def_property_enum_funcs(prop, NULL, "rna_RenderSettings_jpeg2k_depth_set", NULL); - RNA_def_property_ui_text(prop, N_("Depth"), N_("Bit depth per channel")); + RNA_def_property_ui_text(prop, "Depth", "Bit depth per channel"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "jpeg2k_ycc", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_JPEG2K_YCC); - RNA_def_property_ui_text(prop, "YCC", N_("Save luminance-chrominance-chrominance channels instead of RGB colors")); + RNA_def_property_ui_text(prop, "YCC", "Save luminance-chrominance-chrominance channels instead of RGB colors"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); #endif @@ -2498,13 +2497,13 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, "rna_RenderSettings_qtcodecsettings_codecType_get", "rna_RenderSettings_qtcodecsettings_codecType_set", "rna_RenderSettings_qtcodecsettings_codecType_itemf"); - RNA_def_property_ui_text(prop, N_("Codec"), N_("QuickTime codec type")); + RNA_def_property_ui_text(prop, "Codec", "QuickTime codec type"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "quicktime_codec_spatial_quality", PROP_INT, PROP_PERCENTAGE); RNA_def_property_int_sdna(prop, NULL, "qtcodecsettings.codecSpatialQuality"); RNA_def_property_range(prop, 0, 100); - RNA_def_property_ui_text(prop, N_("Spatial quality"), N_("Intra-frame spatial quality level")); + RNA_def_property_ui_text(prop, "Spatial quality", "Intra-frame spatial quality level"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); #ifdef USE_QTKIT @@ -2514,35 +2513,35 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, "rna_RenderSettings_qtcodecsettings_audiocodecType_get", "rna_RenderSettings_qtcodecsettings_audiocodecType_set", "rna_RenderSettings_qtcodecsettings_audiocodecType_itemf"); - RNA_def_property_ui_text(prop, N_("Audio Codec"), N_("QuickTime audio codec type")); + RNA_def_property_ui_text(prop, "Audio Codec", "QuickTime audio codec type"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "quicktime_audio_samplerate", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "qtcodecsettings.audioSampleRate"); RNA_def_property_enum_items(prop, quicktime_audio_samplerate_items); - RNA_def_property_ui_text(prop, N_("Smp Rate"), N_("Sample Rate")); + RNA_def_property_ui_text(prop, "Smp Rate", "Sample Rate"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "quicktime_audio_bitdepth", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "qtcodecsettings.audioBitDepth"); RNA_def_property_enum_items(prop, quicktime_audio_bitdepth_items); - RNA_def_property_ui_text(prop, N_("Bit Depth"), N_("Bit Depth")); + RNA_def_property_ui_text(prop, "Bit Depth", "Bit Depth"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "quicktime_audio_resampling_hq", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "qtcodecsettings.audioCodecFlags", QTAUDIO_FLAG_RESAMPLE_NOHQ); - RNA_def_property_ui_text(prop, "HQ", N_("Use High Quality resampling algorithm")); + RNA_def_property_ui_text(prop, "HQ", "Use High Quality resampling algorithm"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "quicktime_audio_codec_isvbr", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "qtcodecsettings.audioCodecFlags", QTAUDIO_FLAG_CODEC_ISCBR); - RNA_def_property_ui_text(prop, "VBR", N_("Use Variable Bit Rate compression (improves quality at same bitrate)")); + RNA_def_property_ui_text(prop, "VBR", "Use Variable Bit Rate compression (improves quality at same bitrate)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "quicktime_audio_bitrate", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "qtcodecsettings.audioBitRate"); RNA_def_property_enum_items(prop, quicktime_audio_bitrate_items); - RNA_def_property_ui_text(prop, "Bitrate", N_("Compressed audio bitrate")); + RNA_def_property_ui_text(prop, "Bitrate", "Compressed audio bitrate"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); #endif #endif @@ -2553,60 +2552,60 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "ffmpeg_format", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "ffcodecdata.type"); RNA_def_property_enum_items(prop, ffmpeg_format_items); - RNA_def_property_ui_text(prop, N_("Format"), N_("Output file format")); + RNA_def_property_ui_text(prop, "Format", "Output file format"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_codec", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "ffcodecdata.codec"); RNA_def_property_enum_items(prop, ffmpeg_codec_items); - RNA_def_property_ui_text(prop, N_("Codec"), N_("FFMpeg codec to use")); + RNA_def_property_ui_text(prop, "Codec", "FFMpeg codec to use"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_video_bitrate", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.video_bitrate"); RNA_def_property_range(prop, 1, 14000); - RNA_def_property_ui_text(prop, N_("Bitrate"), N_("Video bitrate(kb/s)")); + RNA_def_property_ui_text(prop, "Bitrate", "Video bitrate(kb/s)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_minrate", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.rc_min_rate"); RNA_def_property_range(prop, 0, 9000); - RNA_def_property_ui_text(prop, N_("Min Rate"), N_("Rate control: min rate(kb/s)")); + RNA_def_property_ui_text(prop, "Min Rate", "Rate control: min rate(kb/s)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_maxrate", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.rc_max_rate"); RNA_def_property_range(prop, 1, 14000); - RNA_def_property_ui_text(prop, N_("Max Rate"), N_("Rate control: max rate(kb/s)")); + RNA_def_property_ui_text(prop, "Max Rate", "Rate control: max rate(kb/s)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_muxrate", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.mux_rate"); RNA_def_property_range(prop, 0, 100000000); - RNA_def_property_ui_text(prop, N_("Mux Rate"), N_("Mux rate (bits/s(!))")); + RNA_def_property_ui_text(prop, "Mux Rate", "Mux rate (bits/s(!))"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_gopsize", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.gop_size"); RNA_def_property_range(prop, 0, 100); - RNA_def_property_ui_text(prop, N_("GOP Size"), N_("Distance between key frames")); + RNA_def_property_ui_text(prop, "GOP Size", "Distance between key frames"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_buffersize", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.rc_buffer_size"); RNA_def_property_range(prop, 0, 2000); - RNA_def_property_ui_text(prop, N_("Buffersize"), N_("Rate control: buffer size (kb)")); + RNA_def_property_ui_text(prop, "Buffersize", "Rate control: buffer size (kb)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_packetsize", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.mux_packet_size"); RNA_def_property_range(prop, 0, 16384); - RNA_def_property_ui_text(prop, N_("Mux Packet Size"), N_("Mux packet size (byte)")); + RNA_def_property_ui_text(prop, "Mux Packet Size", "Mux packet size (byte)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_autosplit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ffcodecdata.flags", FFMPEG_AUTOSPLIT_OUTPUT); - RNA_def_property_ui_text(prop, N_("Autosplit Output"), N_("Autosplit output at 2GB boundary")); + RNA_def_property_ui_text(prop, "Autosplit Output", "Autosplit output at 2GB boundary"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* FFMPEG Audio*/ @@ -2614,21 +2613,21 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_enum_bitflag_sdna(prop, NULL, "ffcodecdata.audio_codec"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_enum_items(prop, ffmpeg_audio_codec_items); - RNA_def_property_ui_text(prop, N_("Audio Codec"), N_("FFMpeg audio codec to use")); + RNA_def_property_ui_text(prop, "Audio Codec", "FFMpeg audio codec to use"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_audio_bitrate", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.audio_bitrate"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 32, 384); - RNA_def_property_ui_text(prop, N_("Bitrate"), N_("Audio bitrate(kb/s)")); + RNA_def_property_ui_text(prop, "Bitrate", "Audio bitrate(kb/s)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_audio_volume", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ffcodecdata.audio_volume"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Volume"), N_("Audio volume")); + RNA_def_property_ui_text(prop, "Volume", "Audio volume"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); #endif @@ -2637,27 +2636,27 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "ffcodecdata.audio_mixrate"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 8000, 192000); - RNA_def_property_ui_text(prop, N_("Samplerate"), N_("Audio samplerate(samples/s)")); + RNA_def_property_ui_text(prop, "Samplerate", "Audio samplerate(samples/s)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "ffmpeg_audio_channels", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ffcodecdata.audio_channels"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_enum_items(prop, audio_channel_items); - RNA_def_property_ui_text(prop, N_("Audio Channels"), N_("Sets the audio channel count")); + RNA_def_property_ui_text(prop, "Audio Channels", "Sets the audio channel count"); prop= RNA_def_property(srna, "fps", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "frs_sec"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 120); - RNA_def_property_ui_text(prop, N_("FPS"), N_("Framerate, expressed in frames per second")); + RNA_def_property_ui_text(prop, "FPS", "Framerate, expressed in frames per second"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_Scene_fps_update"); prop= RNA_def_property(srna, "fps_base", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "frs_sec_base"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.1f, 120.0f); - RNA_def_property_ui_text(prop, N_("FPS Base"), N_("Framerate base")); + RNA_def_property_ui_text(prop, "FPS Base", "Framerate base"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_Scene_fps_update"); /* frame mapping */ @@ -2665,136 +2664,136 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "framapto"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 900); - RNA_def_property_ui_text(prop, N_("Frame Map Old"), N_("Specify old mapping value in frames")); + RNA_def_property_ui_text(prop, "Frame Map Old", "Specify old mapping value in frames"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_framelen_update"); prop= RNA_def_property(srna, "frame_map_new", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "images"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 900); - RNA_def_property_ui_text(prop, N_("Frame Map New"), N_("Specify how many frames the Map Old will last")); + RNA_def_property_ui_text(prop, "Frame Map New", "Specify how many frames the Map Old will last"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_framelen_update"); prop= RNA_def_property(srna, "dither_intensity", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "dither_intensity"); RNA_def_property_range(prop, 0.0f, 2.0f); - RNA_def_property_ui_text(prop, N_("Dither Intensity"), N_("Amount of dithering noise added to the rendered image to break up banding")); + RNA_def_property_ui_text(prop, "Dither Intensity", "Amount of dithering noise added to the rendered image to break up banding"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "pixel_filter_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "filtertype"); RNA_def_property_enum_items(prop, pixel_filter_items); - RNA_def_property_ui_text(prop, N_("Pixel Filter"), N_("Reconstruction filter used for combining anti-aliasing samples")); + RNA_def_property_ui_text(prop, "Pixel Filter", "Reconstruction filter used for combining anti-aliasing samples"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "filter_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "gauss"); RNA_def_property_range(prop, 0.5f, 1.5f); - RNA_def_property_ui_text(prop, N_("Filter Size"), N_("Pixel width over which the reconstruction filter combines samples")); + RNA_def_property_ui_text(prop, "Filter Size", "Pixel width over which the reconstruction filter combines samples"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "alpha_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "alphamode"); RNA_def_property_enum_items(prop, alpha_mode_items); - RNA_def_property_ui_text(prop, N_("Alpha Mode"), N_("Representation of alpha information in the RGBA pixels")); + RNA_def_property_ui_text(prop, "Alpha Mode", "Representation of alpha information in the RGBA pixels"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "octree_resolution", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ocres"); RNA_def_property_enum_items(prop, octree_resolution_items); - RNA_def_property_ui_text(prop, N_("Octree Resolution"), N_("Resolution of raytrace accelerator. Use higher resolutions for larger scenes")); + RNA_def_property_ui_text(prop, "Octree Resolution", "Resolution of raytrace accelerator. Use higher resolutions for larger scenes"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "raytrace_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "raytrace_structure"); RNA_def_property_enum_items(prop, raytrace_structure_items); - RNA_def_property_ui_text(prop, N_("Raytrace Acceleration Structure"), N_("Type of raytrace accelerator structure")); + RNA_def_property_ui_text(prop, "Raytrace Acceleration Structure", "Type of raytrace accelerator structure"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_instances", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "raytrace_options", R_RAYTRACE_USE_INSTANCES); - RNA_def_property_ui_text(prop, N_("Use Instances"), N_("Instance support leads to effective memory reduction when using duplicates")); + RNA_def_property_ui_text(prop, "Use Instances", "Instance support leads to effective memory reduction when using duplicates"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_local_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "raytrace_options", R_RAYTRACE_USE_LOCAL_COORDS); - RNA_def_property_ui_text(prop, N_("Use Local Coords"), N_("Vertex coordinates are stored localy on each primitive. Increases memory usage, but may have impact on speed")); + RNA_def_property_ui_text(prop, "Use Local Coords", "Vertex coordinates are stored localy on each primitive. Increases memory usage, but may have impact on speed"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_OSA); - RNA_def_property_ui_text(prop, N_("Anti-Aliasing"), N_("Render and combine multiple samples per pixel to prevent jagged edges")); + RNA_def_property_ui_text(prop, "Anti-Aliasing", "Render and combine multiple samples per pixel to prevent jagged edges"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "antialiasing_samples", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "osa"); RNA_def_property_enum_items(prop, fixed_oversample_items); - RNA_def_property_ui_text(prop, N_("Anti-Aliasing Samples"), N_("Amount of anti-aliasing samples per pixel")); + RNA_def_property_ui_text(prop, "Anti-Aliasing Samples", "Amount of anti-aliasing samples per pixel"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_fields", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_FIELDS); - RNA_def_property_ui_text(prop, N_("Fields"), N_("Render image to two fields per frame, for interlaced TV output")); + RNA_def_property_ui_text(prop, "Fields", "Render image to two fields per frame, for interlaced TV output"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "field_order", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, field_order_items); - RNA_def_property_ui_text(prop, N_("Field Order"), N_("Order of video fields. Select which lines get rendered first, to create smooth motion for TV output")); + RNA_def_property_ui_text(prop, "Field Order", "Order of video fields. Select which lines get rendered first, to create smooth motion for TV output"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_fields_still", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_FIELDSTILL); - RNA_def_property_ui_text(prop, N_("Fields Still"), N_("Disable the time difference between fields")); + RNA_def_property_ui_text(prop, "Fields Still", "Disable the time difference between fields"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* rendering features */ prop= RNA_def_property(srna, "use_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SHADOW); - RNA_def_property_ui_text(prop, N_("Shadows"), N_("Calculate shadows while rendering")); + RNA_def_property_ui_text(prop, "Shadows", "Calculate shadows while rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_envmaps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_ENVMAP); - RNA_def_property_ui_text(prop, N_("Environment Maps"), N_("Calculate environment maps while rendering")); + RNA_def_property_ui_text(prop, "Environment Maps", "Calculate environment maps while rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_radiosity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_RADIO); - RNA_def_property_ui_text(prop, N_("Radiosity"), N_("Calculate radiosity in a pre-process before rendering")); + RNA_def_property_ui_text(prop, "Radiosity", "Calculate radiosity in a pre-process before rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_sss", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SSS); - RNA_def_property_ui_text(prop, N_("Subsurface Scattering"), N_("Calculate sub-surface scattering in materials rendering")); + RNA_def_property_ui_text(prop, "Subsurface Scattering", "Calculate sub-surface scattering in materials rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_raytrace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_RAYTRACE); - RNA_def_property_ui_text(prop, N_("Raytracing"), N_("Pre-calculate the raytrace accelerator and render raytracing effects")); + RNA_def_property_ui_text(prop, "Raytracing", "Pre-calculate the raytrace accelerator and render raytracing effects"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "scemode", R_NO_TEX); - RNA_def_property_ui_text(prop, N_("Textures"), N_("Use textures to affect material properties")); + RNA_def_property_ui_text(prop, "Textures", "Use textures to affect material properties"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_edge_enhance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_EDGE); - RNA_def_property_ui_text(prop, N_("Edge"), N_("Create a toon outline around the edges of geometry")); + RNA_def_property_ui_text(prop, "Edge", "Create a toon outline around the edges of geometry"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "edge_threshold", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "edgeint"); RNA_def_property_range(prop, 0, 255); - RNA_def_property_ui_text(prop, N_("Edge Threshold"), N_("Threshold for drawing outlines on geometry edges")); + RNA_def_property_ui_text(prop, "Edge Threshold", "Threshold for drawing outlines on geometry edges"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "edge_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "edgeR"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, N_("Edge Color"), N_("Edge color")); + RNA_def_property_ui_text(prop, "Edge Color", "Edge color"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* threads */ @@ -2802,148 +2801,148 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "threads"); RNA_def_property_range(prop, 1, BLENDER_MAX_THREADS); RNA_def_property_int_funcs(prop, "rna_RenderSettings_threads_get", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Threads"), N_("Number of CPU threads to use simultaneously while rendering (for multi-core/CPU systems)")); + RNA_def_property_ui_text(prop, "Threads", "Number of CPU threads to use simultaneously while rendering (for multi-core/CPU systems)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "threads_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, threads_mode_items); - RNA_def_property_ui_text(prop, N_("Threads Mode"), N_("Determine the amount of render threads used")); + RNA_def_property_ui_text(prop, "Threads Mode", "Determine the amount of render threads used"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* motion blur */ prop= RNA_def_property(srna, "use_motion_blur", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_MBLUR); - RNA_def_property_ui_text(prop, N_("Motion Blur"), N_("Use multi-sampled 3D scene motion blur")); + RNA_def_property_ui_text(prop, "Motion Blur", "Use multi-sampled 3D scene motion blur"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "motion_blur_samples", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "mblur_samples"); RNA_def_property_range(prop, 1, 32); - RNA_def_property_ui_text(prop, N_("Motion Samples"), N_("Number of scene samples to take with motion blur")); + RNA_def_property_ui_text(prop, "Motion Samples", "Number of scene samples to take with motion blur"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "blurfac"); RNA_def_property_range(prop, 0.01f, 10.0f); RNA_def_property_ui_range(prop, 0.01, 2.0f, 1, 0); - RNA_def_property_ui_text(prop, N_("Shutter"), N_("Time taken in frames between shutter open and close")); + RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* border */ prop= RNA_def_property(srna, "use_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_BORDER); - RNA_def_property_ui_text(prop, N_("Border"), N_("Render a user-defined border region, within the frame size. Note, this disables save_buffers and full_sample")); + RNA_def_property_ui_text(prop, "Border", "Render a user-defined border region, within the frame size. Note, this disables save_buffers and full_sample"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "border_min_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.xmin"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Border Minimum X"), N_("Sets minimum X value to for the render border")); + RNA_def_property_ui_text(prop, "Border Minimum X", "Sets minimum X value to for the render border"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "border_min_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.ymin"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Border Minimum Y"), N_("Sets minimum Y value for the render border")); + RNA_def_property_ui_text(prop, "Border Minimum Y", "Sets minimum Y value for the render border"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "border_max_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.xmax"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Border Maximum X"), N_("Sets maximum X value for the render border")); + RNA_def_property_ui_text(prop, "Border Maximum X", "Sets maximum X value for the render border"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "border_max_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.ymax"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Border Maximum Y"), N_("Sets maximum Y value for the render border")); + RNA_def_property_ui_text(prop, "Border Maximum Y", "Sets maximum Y value for the render border"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_crop_to_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_CROP); - RNA_def_property_ui_text(prop, N_("Crop to Border"), N_("Crop the rendered frame to the defined border size")); + RNA_def_property_ui_text(prop, "Crop to Border", "Crop the rendered frame to the defined border size"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_placeholder", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_TOUCH); - RNA_def_property_ui_text(prop, N_("Placeholders"), N_("Create empty placeholder files while rendering frames (similar to Unix 'touch')")); + RNA_def_property_ui_text(prop, "Placeholders", "Create empty placeholder files while rendering frames (similar to Unix 'touch')"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_overwrite", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", R_NO_OVERWRITE); - RNA_def_property_ui_text(prop, N_("Overwrite"), N_("Overwrite existing files while rendering")); + RNA_def_property_ui_text(prop, "Overwrite", "Overwrite existing files while rendering"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_compositing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_DOCOMP); - RNA_def_property_ui_text(prop, N_("Compositing"), N_("Process the render result through the compositing pipeline, if compositing nodes are enabled")); + RNA_def_property_ui_text(prop, "Compositing", "Process the render result through the compositing pipeline, if compositing nodes are enabled"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_sequencer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_DOSEQ); - RNA_def_property_ui_text(prop, N_("Sequencer"), N_("Process the render (and composited) result through the video sequence editor pipeline, if sequencer strips exist")); + RNA_def_property_ui_text(prop, "Sequencer", "Process the render (and composited) result through the video sequence editor pipeline, if sequencer strips exist"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_color_management", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "color_mgt_flag", R_COLOR_MANAGEMENT); - RNA_def_property_ui_text(prop, N_("Color Management"), N_("Use linear workflow - gamma corrected imaging pipeline")); + RNA_def_property_ui_text(prop, "Color Management", "Use linear workflow - gamma corrected imaging pipeline"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_RenderSettings_color_management_update"); prop= RNA_def_property(srna, "use_file_extension", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXTENSION); - RNA_def_property_ui_text(prop, N_("File Extensions"), N_("Add the file format extensions to the rendered file name (eg: filename + .jpg)")); + RNA_def_property_ui_text(prop, "File Extensions", "Add the file format extensions to the rendered file name (eg: filename + .jpg)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "file_format", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "imtype"); RNA_def_property_enum_items(prop, image_type_items); RNA_def_property_enum_funcs(prop, NULL, "rna_RenderSettings_file_format_set", NULL); - RNA_def_property_ui_text(prop, N_("File Format"), N_("File format to save the rendered images as")); + RNA_def_property_ui_text(prop, "File Format", "File format to save the rendered images as"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "file_extension", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_SceneRender_file_ext_get", "rna_SceneRender_file_ext_length", NULL); - RNA_def_property_ui_text(prop, N_("Extension"), N_("The file extension used for saving renders")); + RNA_def_property_ui_text(prop, "Extension", "The file extension used for saving renders"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "is_movie_format", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_is_movie_fomat_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Movie Format"), N_("When true the format is a movie")); + RNA_def_property_ui_text(prop, "Movie Format", "When true the format is a movie"); prop= RNA_def_property(srna, "use_free_image_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE); - RNA_def_property_ui_text(prop, N_("Free Image Textures"), N_("Free all image texture from memory after render, to save memory before compositing")); + RNA_def_property_ui_text(prop, "Free Image Textures", "Free all image texture from memory after render, to save memory before compositing"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_free_unused_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_COMP_FREE); - RNA_def_property_ui_text(prop, N_("Free Unused Nodes"), N_("Free Nodes that are not used while compositing, to save memory")); + RNA_def_property_ui_text(prop, "Free Unused Nodes", "Free Nodes that are not used while compositing, to save memory"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_save_buffers", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_save_buffers_get", NULL); - RNA_def_property_ui_text(prop, N_("Save Buffers"), N_("Save tiles for all RenderLayers and SceneNodes to files in the temp directory (saves memory, required for Full Sample)")); + RNA_def_property_ui_text(prop, "Save Buffers","Save tiles for all RenderLayers and SceneNodes to files in the temp directory (saves memory, required for Full Sample)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_full_sample", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FULL_SAMPLE); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL); - RNA_def_property_ui_text(prop, N_("Full Sample"),N_("Save for every anti-aliasing sample the entire RenderLayer results. This solves anti-aliasing issues with compositing")); + RNA_def_property_ui_text(prop, "Full Sample","Save for every anti-aliasing sample the entire RenderLayer results. This solves anti-aliasing issues with compositing"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "display_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "displaymode"); RNA_def_property_enum_items(prop, display_mode_items); - RNA_def_property_ui_text(prop, N_("Display"), N_("Select where rendered images will be displayed")); + RNA_def_property_ui_text(prop, "Display", "Select where rendered images will be displayed"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); RNA_def_property_string_sdna(prop, NULL, "pic"); - RNA_def_property_ui_text(prop, N_("Output Path"), N_("Directory/name to save animations, # characters defines the position and length of frame numbers")); + RNA_def_property_ui_text(prop, "Output Path", "Directory/name to save animations, # characters defines the position and length of frame numbers"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* Bake */ @@ -2951,181 +2950,181 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "bake_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_mode"); RNA_def_property_enum_items(prop, bake_mode_items); - RNA_def_property_ui_text(prop, N_("Bake Mode"), N_("Choose shading information to bake into the image")); + RNA_def_property_ui_text(prop, "Bake Mode", "Choose shading information to bake into the image"); prop= RNA_def_property(srna, "bake_normal_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_normal_space"); RNA_def_property_enum_items(prop, bake_normal_space_items); - RNA_def_property_ui_text(prop, N_("Normal Space"), N_("Choose normal space for baking")); + RNA_def_property_ui_text(prop, "Normal Space", "Choose normal space for baking"); prop= RNA_def_property(srna, "bake_quad_split", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, bake_qyad_split_items); - RNA_def_property_ui_text(prop, N_("Quad Split"), N_("Choose the method used to split a quad into 2 triangles for baking")); + RNA_def_property_ui_text(prop, "Quad Split", "Choose the method used to split a quad into 2 triangles for baking"); prop= RNA_def_property(srna, "bake_aa_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "bake_osa"); RNA_def_property_enum_items(prop, fixed_oversample_items); - RNA_def_property_ui_text(prop, N_("Anti-Aliasing Level"), ""); + RNA_def_property_ui_text(prop, "Anti-Aliasing Level", ""); prop= RNA_def_property(srna, "use_bake_selected_to_active", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_TO_ACTIVE); - RNA_def_property_ui_text(prop, N_("Selected to Active"), N_("Bake shading on the surface of selected objects to the active object")); + RNA_def_property_ui_text(prop, "Selected to Active", "Bake shading on the surface of selected objects to the active object"); prop= RNA_def_property(srna, "use_bake_normalize", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_NORMALIZE); - RNA_def_property_ui_text(prop, N_("Normalized"), N_("With displacement normalize to the distance, with ambient occlusion normalize without using material settings")); + RNA_def_property_ui_text(prop, "Normalized", "With displacement normalize to the distance, with ambient occlusion normalize without using material settings"); prop= RNA_def_property(srna, "use_bake_clear", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_CLEAR); - RNA_def_property_ui_text(prop, N_("Clear"), N_("Clear Images before baking")); + RNA_def_property_ui_text(prop, "Clear", "Clear Images before baking"); prop= RNA_def_property(srna, "use_bake_antialiasing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_OSA); - RNA_def_property_ui_text(prop, N_("Anti-Aliasing"), N_("Enables Anti-aliasing")); + RNA_def_property_ui_text(prop, "Anti-Aliasing", "Enables Anti-aliasing"); prop= RNA_def_property(srna, "bake_margin", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "bake_filter"); - RNA_def_property_range(prop, 0, 32); - RNA_def_property_ui_text(prop, N_("Margin"), N_("Amount of pixels to extend the baked result with, as post process filter")); + RNA_def_property_range(prop, 0, 64); + RNA_def_property_ui_text(prop, "Margin", "Amount of pixels to extend the baked result with, as post process filter"); prop= RNA_def_property(srna, "bake_distance", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bake_maxdist"); RNA_def_property_range(prop, 0.0, 1000.0); - RNA_def_property_ui_text(prop, N_("Distance"), N_("Maximum distance from active object to other object (in blender units")); + RNA_def_property_ui_text(prop, "Distance", "Maximum distance from active object to other object (in blender units"); prop= RNA_def_property(srna, "bake_bias", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bake_biasdist"); RNA_def_property_range(prop, 0.0, 1000.0); - RNA_def_property_ui_text(prop, N_("Bias"), N_("Bias towards faces further away from the object (in blender units)")); + RNA_def_property_ui_text(prop, "Bias", "Bias towards faces further away from the object (in blender units)"); prop= RNA_def_property(srna, "use_bake_multires", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_MULTIRES); - RNA_def_property_ui_text(prop, N_("Bake from Multires"), N_("Bake directly from multires object")); + RNA_def_property_ui_text(prop, "Bake from Multires", "Bake directly from multires object"); prop= RNA_def_property(srna, "use_bake_lores_mesh", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_LORES_MESH); - RNA_def_property_ui_text(prop, N_("Low Resolution Mesh"), N_("Calculate heights against unsubdivided low resolution mesh")); + RNA_def_property_ui_text(prop, "Low Resolution Mesh", "Calculate heights against unsubdivided low resolution mesh"); /* stamp */ prop= RNA_def_property(srna, "use_stamp_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_TIME); - RNA_def_property_ui_text(prop, N_("Stamp Time"), N_("Include the render frame as HH:MM:SS.FF in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Time", "Include the render frame as HH:MM:SS.FF in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_date", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_DATE); - RNA_def_property_ui_text(prop, N_("Stamp Date"), N_("Include the current date in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Date", "Include the current date in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_frame", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_FRAME); - RNA_def_property_ui_text(prop, N_("Stamp Frame"), N_("Include the frame number in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Frame", "Include the frame number in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_camera", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_CAMERA); - RNA_def_property_ui_text(prop, N_("Stamp Camera"), N_("Include the name of the active camera in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Camera", "Include the name of the active camera in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_lens", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_CAMERALENS); - RNA_def_property_ui_text(prop, N_("Stamp Lens"), N_("Include the name of the active cameras lens in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Lens", "Include the name of the active cameras lens in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_scene", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_SCENE); - RNA_def_property_ui_text(prop, N_("Stamp Scene"), N_("Include the name of the active scene in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Scene", "Include the name of the active scene in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_note", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_NOTE); - RNA_def_property_ui_text(prop, N_("Stamp Note"), N_("Include a custom note in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Note", "Include a custom note in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_marker", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_MARKER); - RNA_def_property_ui_text(prop, N_("Stamp Marker"), N_("Include the name of the last marker in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Marker", "Include the name of the last marker in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_filename", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_FILENAME); - RNA_def_property_ui_text(prop, N_("Stamp Filename"), N_("Include the filename of the .blend file in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Filename", "Include the filename of the .blend file in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_sequencer_strip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_SEQSTRIP); - RNA_def_property_ui_text(prop, N_("Stamp Sequence Strip"), N_("Include the name of the foreground sequence strip in image metadata")); + RNA_def_property_ui_text(prop, "Stamp Sequence Strip", "Include the name of the foreground sequence strip in image metadata"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp_render_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_RENDERTIME); - RNA_def_property_ui_text(prop, N_("Stamp Render Time"), N_("Include the render time in the stamp image")); + RNA_def_property_ui_text(prop, "Stamp Render Time", "Include the render time in the stamp image"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "stamp_note_text", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "stamp_udata"); - RNA_def_property_ui_text(prop, N_("Stamp Note Text"), N_("Custom text to appear in the stamp note")); + RNA_def_property_ui_text(prop, "Stamp Note Text", "Custom text to appear in the stamp note"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "use_stamp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_DRAW); - RNA_def_property_ui_text(prop, N_("Render Stamp"), N_("Render the stamp info text in the rendered image")); + RNA_def_property_ui_text(prop, "Render Stamp", "Render the stamp info text in the rendered image"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "stamp_font_size", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "stamp_font_id"); RNA_def_property_range(prop, 8, 64); - RNA_def_property_ui_text(prop, N_("Font Size"), N_("Size of the font used when rendering stamp text")); + RNA_def_property_ui_text(prop, "Font Size", "Size of the font used when rendering stamp text"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "stamp_foreground", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "fg_stamp"); RNA_def_property_array(prop, 4); RNA_def_property_range(prop,0.0,1.0); - RNA_def_property_ui_text(prop, N_("Stamp Text Color"), N_("Color to use for stamp text")); + RNA_def_property_ui_text(prop, "Stamp Text Color", "Color to use for stamp text"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "stamp_background", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "bg_stamp"); RNA_def_property_array(prop, 4); RNA_def_property_range(prop,0.0,1.0); - RNA_def_property_ui_text(prop, N_("Stamp Background"), N_("Color to use behind stamp text")); + RNA_def_property_ui_text(prop, "Stamp Background", "Color to use behind stamp text"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* sequencer draw options */ prop= RNA_def_property(srna, "use_sequencer_gl_preview", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "seq_flag", R_SEQ_GL_PREV); - RNA_def_property_ui_text(prop, N_("Sequencer OpenGL"), ""); + RNA_def_property_ui_text(prop, "Sequencer OpenGL", ""); prop= RNA_def_property(srna, "use_sequencer_gl_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "seq_flag", R_SEQ_GL_REND); - RNA_def_property_ui_text(prop, N_("Sequencer OpenGL"), ""); + RNA_def_property_ui_text(prop, "Sequencer OpenGL", ""); prop= RNA_def_property(srna, "sequencer_gl_preview", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "seq_prev_type"); RNA_def_property_enum_items(prop, viewport_shade_items); - RNA_def_property_ui_text(prop, N_("Sequencer Preview Shading"), N_("Method to draw in the sequencer view")); + RNA_def_property_ui_text(prop, "Sequencer Preview Shading", "Method to draw in the sequencer view"); prop= RNA_def_property(srna, "sequencer_gl_render", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "seq_rend_type"); RNA_def_property_enum_items(prop, viewport_shade_items); - RNA_def_property_ui_text(prop, N_("Sequencer Preview Shading"), N_("Method to draw in the sequencer view")); + RNA_def_property_ui_text(prop, "Sequencer Preview Shading", "Method to draw in the sequencer view"); /* layers */ prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "layers", NULL); RNA_def_property_struct_type(prop, "SceneRenderLayer"); - RNA_def_property_ui_text(prop, N_("Render Layers"), ""); + RNA_def_property_ui_text(prop, "Render Layers", ""); rna_def_render_layers(brna, prop); prop= RNA_def_property(srna, "use_single_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_SINGLE_LAYER); - RNA_def_property_ui_text(prop, N_("Single Layer"), N_("Only render the active layer")); + RNA_def_property_ui_text(prop, "Single Layer", "Only render the active layer"); RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -3133,50 +3132,50 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "engine", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, engine_items); RNA_def_property_enum_funcs(prop, "rna_RenderSettings_engine_get", "rna_RenderSettings_engine_set", "rna_RenderSettings_engine_itemf"); - RNA_def_property_ui_text(prop, N_("Engine"), N_("Engine to use for rendering")); + RNA_def_property_ui_text(prop, "Engine", "Engine to use for rendering"); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "has_multiple_engines", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_multiple_engines_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Multiple Engines"), N_("More than one rendering engine is available")); + RNA_def_property_ui_text(prop, "Multiple Engines", "More than one rendering engine is available"); prop= RNA_def_property(srna, "use_game_engine", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_use_game_engine_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Use Game Engine"), N_("Current rendering engine is a game engine")); + RNA_def_property_ui_text(prop, "Use Game Engine", "Current rendering engine is a game engine"); /* simplify */ prop= RNA_def_property(srna, "use_simplify", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SIMPLIFY); - RNA_def_property_ui_text(prop, N_("Use Simplify"), N_("Enable simplification of scene for quicker preview renders")); + RNA_def_property_ui_text(prop, "Use Simplify", "Enable simplification of scene for quicker preview renders"); RNA_def_property_update(prop, 0, "rna_Scene_use_simplify_update"); prop= RNA_def_property(srna, "simplify_subdivision", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "simplify_subsurf"); RNA_def_property_ui_range(prop, 0, 6, 1, 0); - RNA_def_property_ui_text(prop, N_("Simplify Subdivision"), N_("Global maximum subdivision level")); + RNA_def_property_ui_text(prop, "Simplify Subdivision", "Global maximum subdivision level"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop= RNA_def_property(srna, "simplify_child_particles", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "simplify_particles"); - RNA_def_property_ui_text(prop, N_("Simplify Child Particles"), N_("Global child particles percentage")); + RNA_def_property_ui_text(prop, "Simplify Child Particles", "Global child particles percentage"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop= RNA_def_property(srna, "simplify_shadow_samples", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "simplify_shadowsamples"); RNA_def_property_ui_range(prop, 1, 16, 1, 0); - RNA_def_property_ui_text(prop, N_("Simplify Shadow Samples"), N_("Global maximum shadow samples")); + RNA_def_property_ui_text(prop, "Simplify Shadow Samples", "Global maximum shadow samples"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop= RNA_def_property(srna, "simplify_ao_sss", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "simplify_aosss"); - RNA_def_property_ui_text(prop, N_("Simplify AO and SSS"), N_("Global approximate AA and SSS quality factor")); + RNA_def_property_ui_text(prop, "Simplify AO and SSS", "Global approximate AA and SSS quality factor"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop= RNA_def_property(srna, "use_simplify_triangulate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "simplify_flag", R_SIMPLE_NO_TRIANGULATE); - RNA_def_property_ui_text(prop, N_("Skip Quad to Triangles"), N_("Disables non-planer quads being triangulated")); + RNA_def_property_ui_text(prop, "Skip Quad to Triangles", "Disables non-planer quads being triangulated"); /* Scene API */ RNA_api_scene_render(srna); @@ -3284,30 +3283,30 @@ static void rna_def_scene_keying_sets(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "KeyingSets"); srna= RNA_def_struct(brna, "KeyingSets", NULL); RNA_def_struct_sdna(srna, "Scene"); - RNA_def_struct_ui_text(srna, N_("Keying Sets"), N_("Scene keying sets")); + RNA_def_struct_ui_text(srna, "Keying Sets", "Scene keying sets"); /* Add Keying Set */ func= RNA_def_function(srna, "new", "rna_Scene_keying_set_new"); - RNA_def_function_ui_description(func, N_("Add a new Keying Set to Scene.")); + RNA_def_function_ui_description(func, "Add a new Keying Set to Scene."); RNA_def_function_flag(func, FUNC_USE_REPORTS); /* name */ - RNA_def_string(func, "name", "KeyingSet", 64, N_("Name"), N_("Name of Keying Set")); + RNA_def_string(func, "name", "KeyingSet", 64, "Name", "Name of Keying Set"); /* returns the new KeyingSet */ - parm= RNA_def_pointer(func, "keyingset", "KeyingSet", "", N_("Newly created Keying Set.")); + parm= RNA_def_pointer(func, "keyingset", "KeyingSet", "", "Newly created Keying Set."); RNA_def_function_return(func, parm); prop= RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "KeyingSet"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_Scene_active_keying_set_get", "rna_Scene_active_keying_set_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Active Keying Set"), N_("Active Keying Set used to insert/delete keyframes")); + RNA_def_property_ui_text(prop, "Active Keying Set", "Active Keying Set used to insert/delete keyframes"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); prop= RNA_def_property(srna, "active_index", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "active_keyingset"); RNA_def_property_int_funcs(prop, "rna_Scene_active_keying_set_index_get", "rna_Scene_active_keying_set_index_set", NULL); - RNA_def_property_ui_text(prop, N_("Active Keying Set Index"), N_("Current Keying Set index (negative for 'builtin' and positive for 'absolute')")); + RNA_def_property_ui_text(prop, "Active Keying Set Index", "Current Keying Set index (negative for 'builtin' and positive for 'absolute')"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); } @@ -3319,7 +3318,7 @@ static void rna_def_scene_keying_sets_all(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "KeyingSetsAll"); srna= RNA_def_struct(brna, "KeyingSetsAll", NULL); RNA_def_struct_sdna(srna, "Scene"); - RNA_def_struct_ui_text(srna, N_("Keying Sets All"), N_("All available keying sets")); + RNA_def_struct_ui_text(srna, "Keying Sets All", "All available keying sets"); /* NOTE: no add/remove available here, without screwing up this amalgamated list... */ @@ -3327,13 +3326,13 @@ static void rna_def_scene_keying_sets_all(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_struct_type(prop, "KeyingSet"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_Scene_active_keying_set_get", "rna_Scene_active_keying_set_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Active Keying Set"), N_("Active Keying Set used to insert/delete keyframes")); + RNA_def_property_ui_text(prop, "Active Keying Set", "Active Keying Set used to insert/delete keyframes"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); prop= RNA_def_property(srna, "active_index", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "active_keyingset"); RNA_def_property_int_funcs(prop, "rna_Scene_active_keying_set_index_get", "rna_Scene_active_keying_set_index_set", NULL); - RNA_def_property_ui_text(prop, N_("Active Keying Set Index"), N_("Current Keying Set index (negative for 'builtin' and positive for 'absolute')")); + RNA_def_property_ui_text(prop, "Active Keying Set Index", "Current Keying Set index (negative for 'builtin' and positive for 'absolute')"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); } @@ -3344,24 +3343,24 @@ void RNA_def_scene(BlenderRNA *brna) FunctionRNA *func; static EnumPropertyItem audio_distance_model_items[] = { - {0, "NONE", 0, N_("None"), N_("No distance attenuation")}, - {1, "INVERSE", 0, N_("Inverse"), N_("Inverse distance model")}, - {2, "INVERSE_CLAMPED", 0, N_("Inverse Clamped"), N_("Inverse distance model with clamping")}, - {3, "LINEAR", 0, N_("Linear"), N_("Linear distance model")}, - {4, "LINEAR_CLAMPED", 0, N_("Linear Clamped"), N_("Linear distance model with clamping")}, - {5, "EXPONENT", 0, N_("Exponent"), N_("Exponent distance model")}, - {6, "EXPONENT_CLAMPED", 0, N_("Exponent Clamped"), N_("Exponent distance model with clamping")}, + {0, "NONE", 0, "None", "No distance attenuation"}, + {1, "INVERSE", 0, "Inverse", "Inverse distance model"}, + {2, "INVERSE_CLAMPED", 0, "Inverse Clamped", "Inverse distance model with clamping"}, + {3, "LINEAR", 0, "Linear", "Linear distance model"}, + {4, "LINEAR_CLAMPED", 0, "Linear Clamped", "Linear distance model with clamping"}, + {5, "EXPONENT", 0, "Exponent", "Exponent distance model"}, + {6, "EXPONENT_CLAMPED", 0, "Exponent Clamped", "Exponent distance model with clamping"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem sync_mode_items[] = { - {0, "NONE", 0, N_("No Sync"), N_("Do not sync, play every frame")}, - {SCE_FRAME_DROP, "FRAME_DROP", 0, N_("Frame Dropping"), N_("Drop frames if playback is too slow")}, - {AUDIO_SYNC, "AUDIO_SYNC", 0, N_("AV-sync"), N_("Sync to audio playback, dropping frames")}, + {0, "NONE", 0, "No Sync", "Do not sync, play every frame"}, + {SCE_FRAME_DROP, "FRAME_DROP", 0, "Frame Dropping", "Drop frames if playback is too slow"}, + {AUDIO_SYNC, "AUDIO_SYNC", 0, "AV-sync", "Sync to audio playback, dropping frames"}, {0, NULL, 0, NULL, NULL}}; /* Struct definition */ srna= RNA_def_struct(brna, "Scene", "ID"); - RNA_def_struct_ui_text(srna, N_("Scene"), N_("Scene consisting objects and defining time and render related settings")); + RNA_def_struct_ui_text(srna, "Scene", "Scene consisting objects and defining time and render related settings"); RNA_def_struct_ui_icon(srna, ICON_SCENE_DATA); RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); @@ -3369,7 +3368,7 @@ void RNA_def_scene(BlenderRNA *brna) prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Camera_object_poll"); - RNA_def_property_ui_text(prop, N_("Camera"), N_("Active camera used for rendering the scene")); + RNA_def_property_ui_text(prop, "Camera", "Active camera used for rendering the scene"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_view3d_update"); prop= RNA_def_property(srna, "background_set", PROP_POINTER, PROP_NONE); @@ -3377,17 +3376,17 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Scene"); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); RNA_def_property_pointer_funcs(prop, NULL, "rna_Scene_set_set", NULL, NULL); - RNA_def_property_ui_text(prop, N_("Background Scene"), N_("Background set scene")); + RNA_def_property_ui_text(prop, "Background Scene", "Background set scene"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, NULL); prop= RNA_def_property(srna, "world", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("World"), N_("World used for rendering the scene")); + RNA_def_property_ui_text(prop, "World", "World used for rendering the scene"); RNA_def_property_update(prop, NC_SCENE|ND_WORLD, NULL); prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ_LENGTH); RNA_def_property_float_sdna(prop, NULL, "cursor"); - RNA_def_property_ui_text(prop, N_("Cursor Location"), N_("3D cursor location")); + RNA_def_property_ui_text(prop, "Cursor Location", "3D cursor location"); RNA_def_property_ui_range(prop, -10000.0, 10000.0, 10, 4); RNA_def_property_update(prop, NC_WINDOW, NULL); @@ -3395,14 +3394,14 @@ void RNA_def_scene(BlenderRNA *brna) prop= RNA_def_property(srna, "object_bases", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "base", NULL); RNA_def_property_struct_type(prop, "ObjectBase"); - RNA_def_property_ui_text(prop, N_("Bases"), ""); + RNA_def_property_ui_text(prop, "Bases", ""); RNA_def_property_collection_funcs(prop, 0, 0, 0, 0, 0, 0, "rna_Scene_object_bases_lookup_string"); rna_def_scene_bases(brna, prop); prop= RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "base", NULL); RNA_def_property_struct_type(prop, "Object"); - RNA_def_property_ui_text(prop, N_("Objects"), ""); + RNA_def_property_ui_text(prop, "Objects", ""); RNA_def_property_collection_funcs(prop, 0, 0, 0, "rna_Scene_objects_get", 0, 0, 0); rna_def_scene_objects(brna, prop); @@ -3412,7 +3411,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "lay", 1); RNA_def_property_array(prop, 20); RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_layer_set"); - RNA_def_property_ui_text(prop, N_("Layers"), N_("Layers visible when rendering the scene")); + RNA_def_property_ui_text(prop, "Layers", "Layers visible when rendering the scene"); RNA_def_property_update(prop, NC_SCENE|ND_LAYER, "rna_Scene_layer_update"); /* Frame Range Stuff */ @@ -3421,12 +3420,12 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "r.cfra"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_current_frame_set", NULL); - RNA_def_property_ui_text(prop, N_("Current Frame"), N_("Current Frame, to update animation data from python frame_set() instead")); + RNA_def_property_ui_text(prop, "Current Frame", "Current Frame, to update animation data from python frame_set() instead"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_frame_update"); prop= RNA_def_property(srna, "frame_subframe", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "r.subframe"); - RNA_def_property_ui_text(prop, N_("Current Sub-Frame"), ""); + RNA_def_property_ui_text(prop, "Current Sub-Frame", ""); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE|PROP_EDITABLE); prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); @@ -3434,7 +3433,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "r.sfra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_start_frame_set", NULL); RNA_def_property_range(prop, MINFRAME, MAXFRAME); - RNA_def_property_ui_text(prop, N_("Start Frame"), N_("First frame of the playback/rendering range")); + RNA_def_property_ui_text(prop, "Start Frame", "First frame of the playback/rendering range"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME_RANGE, NULL); prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); @@ -3442,7 +3441,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "r.efra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_end_frame_set", NULL); RNA_def_property_range(prop, MINFRAME, MAXFRAME); - RNA_def_property_ui_text(prop, N_("End Frame"), N_("Final frame of the playback/rendering range")); + RNA_def_property_ui_text(prop, "End Frame", "Final frame of the playback/rendering range"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME_RANGE, NULL); prop= RNA_def_property(srna, "frame_step", PROP_INT, PROP_TIME); @@ -3450,7 +3449,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "r.frame_step"); RNA_def_property_range(prop, 0, MAXFRAME); RNA_def_property_ui_range(prop, 1, 100, 1, 0); - RNA_def_property_ui_text(prop, N_("Frame Step"), N_("Number of frames to skip forward while rendering/playing back each frame")); + RNA_def_property_ui_text(prop, "Frame Step", "Number of frames to skip forward while rendering/playing back each frame"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); /* Preview Range (frame-range for UI playback) */ @@ -3458,7 +3457,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_boolean_sdna(prop, NULL, "r.flag", SCER_PRV_RANGE); RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_use_preview_range_set"); - RNA_def_property_ui_text(prop, N_("Use Preview Range"), N_("Use an alternative start/end frame for UI playback, rather than the scene start/end frame")); + RNA_def_property_ui_text(prop, "Use Preview Range", "Use an alternative start/end frame for UI playback, rather than the scene start/end frame"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); RNA_def_property_ui_icon(prop, ICON_PREVIEW_RANGE, 0); @@ -3466,20 +3465,20 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.psfra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_preview_range_start_frame_set", NULL); - RNA_def_property_ui_text(prop, N_("Preview Range Start Frame"), N_("Alternative start frame for UI playback")); + RNA_def_property_ui_text(prop, "Preview Range Start Frame", "Alternative start frame for UI playback"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); prop= RNA_def_property(srna, "frame_preview_end", PROP_INT, PROP_TIME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.pefra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_preview_range_end_frame_set", NULL); - RNA_def_property_ui_text(prop, N_("Preview Range End Frame"), N_("Alternative end frame for UI playback")); + RNA_def_property_ui_text(prop, "Preview Range End Frame", "Alternative end frame for UI playback"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); /* Stamp */ prop= RNA_def_property(srna, "use_stamp_note", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "r.stamp_udata"); - RNA_def_property_ui_text(prop, N_("Stamp Note"), N_("User define note for the render stamping")); + RNA_def_property_ui_text(prop, "Stamp Note", "User define note for the render stamping"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* Animation Data (for Scene) */ @@ -3489,51 +3488,51 @@ void RNA_def_scene(BlenderRNA *brna) prop= RNA_def_property(srna, "is_nla_tweakmode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_NLA_EDIT_ON); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* DO NOT MAKE THIS EDITABLE, OR NLA EDITOR BREAKS */ - RNA_def_property_ui_text(prop, N_("NLA TweakMode"), N_("Indicates whether there is any action referenced by NLA being edited. Strictly read-only")); + RNA_def_property_ui_text(prop, "NLA TweakMode", "Indicates whether there is any action referenced by NLA being edited. Strictly read-only"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); /* Frame dropping flag for playback and sync enum */ prop= RNA_def_property(srna, "use_frame_drop", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_FRAME_DROP); - RNA_def_property_ui_text(prop, N_("Frame Dropping"), N_("Play back dropping frames if frame display is too slow")); + RNA_def_property_ui_text(prop, "Frame Dropping", "Play back dropping frames if frame display is too slow"); RNA_def_property_update(prop, NC_SCENE, NULL); prop= RNA_def_property(srna, "sync_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_funcs(prop, "rna_Scene_sync_mode_get", "rna_Scene_sync_mode_set", NULL); RNA_def_property_enum_items(prop, sync_mode_items); - RNA_def_property_ui_text(prop, N_("Sync Mode"), N_("How to sync playback")); + RNA_def_property_ui_text(prop, "Sync Mode", "How to sync playback"); RNA_def_property_update(prop, NC_SCENE, NULL); /* Nodes (Compositing) */ prop= RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "nodetree"); - RNA_def_property_ui_text(prop, N_("Node Tree"), N_("Compositing node tree")); + RNA_def_property_ui_text(prop, "Node Tree", "Compositing node tree"); prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1); RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_use_nodes_set"); - RNA_def_property_ui_text(prop, N_("Use Nodes"), N_("Enable the compositing node tree")); + RNA_def_property_ui_text(prop, "Use Nodes", "Enable the compositing node tree"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* Sequencer */ prop= RNA_def_property(srna, "sequence_editor", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "ed"); RNA_def_property_struct_type(prop, "SequenceEditor"); - RNA_def_property_ui_text(prop, N_("Sequence Editor"), ""); + RNA_def_property_ui_text(prop, "Sequence Editor", ""); /* Keying Sets */ prop= RNA_def_property(srna, "keying_sets", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "keyingsets", NULL); RNA_def_property_struct_type(prop, "KeyingSet"); - RNA_def_property_ui_text(prop, N_("Absolute Keying Sets"), N_("Absolute Keying Sets for this Scene")); + RNA_def_property_ui_text(prop, "Absolute Keying Sets", "Absolute Keying Sets for this Scene"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); rna_def_scene_keying_sets(brna, prop); prop= RNA_def_property(srna, "keying_sets_all", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_funcs(prop, "rna_Scene_all_keyingsets_begin", "rna_Scene_all_keyingsets_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0); RNA_def_property_struct_type(prop, "KeyingSet"); - RNA_def_property_ui_text(prop, N_("All Keying Sets"), N_("All Keying Sets available for use (Builtins and Absolute Keying Sets for this Scene)")); + RNA_def_property_ui_text(prop, "All Keying Sets", "All Keying Sets available for use (Builtins and Absolute Keying Sets for this Scene)"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); rna_def_scene_keying_sets_all(brna, prop); @@ -3542,26 +3541,26 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "toolsettings"); RNA_def_property_struct_type(prop, "ToolSettings"); - RNA_def_property_ui_text(prop, N_("Tool Settings"), ""); + RNA_def_property_ui_text(prop, "Tool Settings", ""); /* Unit Settings */ prop= RNA_def_property(srna, "unit_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "unit"); RNA_def_property_struct_type(prop, "UnitSettings"); - RNA_def_property_ui_text(prop, N_("Unit Settings"), N_("Unit editing settings")); + RNA_def_property_ui_text(prop, "Unit Settings", "Unit editing settings"); /* Physics Settings */ prop= RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_ACCELERATION); RNA_def_property_float_sdna(prop, NULL, "physics_settings.gravity"); RNA_def_property_array(prop, 3); RNA_def_property_range(prop, -200.0f, 200.0f); - RNA_def_property_ui_text(prop, N_("Gravity"), N_("Constant acceleration in a given direction")); + RNA_def_property_ui_text(prop, "Gravity", "Constant acceleration in a given direction"); RNA_def_property_update(prop, 0, "rna_Physics_update"); prop= RNA_def_property(srna, "use_gravity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "physics_settings.flag", PHYS_GLOBAL_GRAVITY); - RNA_def_property_ui_text(prop, N_("Global Gravity"), N_("Use global gravity for all dynamics")); + RNA_def_property_ui_text(prop, "Global Gravity", "Use global gravity for all dynamics"); RNA_def_property_update(prop, 0, "rna_Physics_update"); /* Render Data */ @@ -3569,56 +3568,56 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "r"); RNA_def_property_struct_type(prop, "RenderSettings"); - RNA_def_property_ui_text(prop, N_("Render Data"), ""); + RNA_def_property_ui_text(prop, "Render Data", ""); /* Markers */ prop= RNA_def_property(srna, "timeline_markers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "markers", NULL); RNA_def_property_struct_type(prop, "TimelineMarker"); - RNA_def_property_ui_text(prop, N_("Timeline Markers"), N_("Markers used in all timelines for the current scene")); + RNA_def_property_ui_text(prop, "Timeline Markers", "Markers used in all timelines for the current scene"); rna_def_timeline_markers(brna, prop); /* Audio Settings */ prop= RNA_def_property(srna, "use_audio", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_Scene_use_audio_get", "rna_Scene_use_audio_set"); - RNA_def_property_ui_text(prop, N_("Audio Muted"), N_("Play back of audio from Sequence Editor will be muted")); + RNA_def_property_ui_text(prop, "Audio Muted", "Play back of audio from Sequence Editor will be muted"); RNA_def_property_update(prop, NC_SCENE, NULL); prop= RNA_def_property(srna, "use_audio_sync", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "audio.flag", AUDIO_SYNC); - RNA_def_property_ui_text(prop, N_("Audio Sync"), N_("Play back and sync with audio clock, dropping frames if frame display is too slow")); + RNA_def_property_ui_text(prop, "Audio Sync", "Play back and sync with audio clock, dropping frames if frame display is too slow"); RNA_def_property_update(prop, NC_SCENE, NULL); prop= RNA_def_property(srna, "use_audio_scrub", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "audio.flag", AUDIO_SCRUB); - RNA_def_property_ui_text(prop, N_("Audio Scrubbing"), N_("Play audio from Sequence Editor while scrubbing")); + RNA_def_property_ui_text(prop, "Audio Scrubbing", "Play audio from Sequence Editor while scrubbing"); RNA_def_property_update(prop, NC_SCENE, NULL); prop= RNA_def_property(srna, "audio_doppler_speed", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "audio.speed_of_sound"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.01f, FLT_MAX); - RNA_def_property_ui_text(prop, N_("Speed of Sound"), N_("Speed of sound for Doppler effect calculation")); + RNA_def_property_ui_text(prop, "Speed of Sound", "Speed of sound for Doppler effect calculation"); RNA_def_property_update(prop, NC_SCENE, "rna_Scene_listener_update"); prop= RNA_def_property(srna, "audio_doppler_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "audio.doppler_factor"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.0, FLT_MAX); - RNA_def_property_ui_text(prop, N_("Doppler Factor"), N_("Pitch factor for Doppler effect calculation")); + RNA_def_property_ui_text(prop, "Doppler Factor", "Pitch factor for Doppler effect calculation"); RNA_def_property_update(prop, NC_SCENE, "rna_Scene_listener_update"); prop= RNA_def_property(srna, "audio_distance_model", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "audio.distance_model"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_enum_items(prop, audio_distance_model_items); - RNA_def_property_ui_text(prop, N_("Distance Model"), N_("Distance model for distance attenuation calculation")); + RNA_def_property_ui_text(prop, "Distance Model", "Distance model for distance attenuation calculation"); RNA_def_property_update(prop, NC_SCENE, "rna_Scene_listener_update"); prop= RNA_def_property(srna, "audio_volume", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "audio.volume"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, N_("Volume"), N_("Audio volume")); + RNA_def_property_ui_text(prop, "Volume", "Audio volume"); RNA_def_property_update(prop, NC_SCENE, NULL); RNA_def_property_float_funcs(prop, NULL, "rna_Scene_volume_set", NULL); @@ -3627,7 +3626,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "gm"); RNA_def_property_struct_type(prop, "SceneGameData"); - RNA_def_property_ui_text(prop, N_("Game Data"), ""); + RNA_def_property_ui_text(prop, "Game Data", ""); /* Statistics */ func= RNA_def_function(srna, "statistics", "ED_info_stats_string"); @@ -3639,14 +3638,14 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "gpd"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "GreasePencil"); - RNA_def_property_ui_text(prop, N_("Grease Pencil Data"), N_("Grease Pencil datablock")); + RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock"); RNA_def_property_update(prop, NC_SCENE, NULL); /* Transform Orientations */ prop= RNA_def_property(srna, "orientations", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "transform_spaces", NULL); RNA_def_property_struct_type(prop, "TransformOrientation"); - RNA_def_property_ui_text(prop, N_("Transform Orientations"), ""); + RNA_def_property_ui_text(prop, "Transform Orientations", ""); /* Nestled Data */ rna_def_tool_settings(brna); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 9467d84f42f..3463b2f6c03 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -34,8 +34,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "BLF_api.h" - #include "rna_internal.h" #include "BKE_key.h" @@ -54,57 +52,57 @@ #include "RNA_enum_types.h" EnumPropertyItem space_type_items[] = { - {SPACE_EMPTY, "EMPTY", 0, N_("Empty"), ""}, - {SPACE_VIEW3D, "VIEW_3D", 0, N_("3D View"), ""}, - {SPACE_IPO, "GRAPH_EDITOR", 0, N_("Graph Editor"), ""}, - {SPACE_OUTLINER, "OUTLINER", 0, N_("Outliner"), ""}, - {SPACE_BUTS, "PROPERTIES", 0, N_("Properties"), ""}, - {SPACE_FILE, "FILE_BROWSER", 0, N_("File Browser"), ""}, - {SPACE_IMAGE, "IMAGE_EDITOR", 0, N_("Image Editor"), ""}, - {SPACE_INFO, "INFO", 0, N_("Info"), ""}, - {SPACE_SEQ, "SEQUENCE_EDITOR", 0, N_("Sequence Editor"), ""}, - {SPACE_TEXT, "TEXT_EDITOR", 0, N_("Text Editor"), ""}, + {SPACE_EMPTY, "EMPTY", 0, "Empty", ""}, + {SPACE_VIEW3D, "VIEW_3D", 0, "3D View", ""}, + {SPACE_IPO, "GRAPH_EDITOR", 0, "Graph Editor", ""}, + {SPACE_OUTLINER, "OUTLINER", 0, "Outliner", ""}, + {SPACE_BUTS, "PROPERTIES", 0, "Properties", ""}, + {SPACE_FILE, "FILE_BROWSER", 0, "File Browser", ""}, + {SPACE_IMAGE, "IMAGE_EDITOR", 0, "Image Editor", ""}, + {SPACE_INFO, "INFO", 0, "Info", ""}, + {SPACE_SEQ, "SEQUENCE_EDITOR", 0, "Sequence Editor", ""}, + {SPACE_TEXT, "TEXT_EDITOR", 0, "Text Editor", ""}, //{SPACE_IMASEL, "IMAGE_BROWSER", 0, "Image Browser", ""}, - {SPACE_SOUND, "AUDIO_WINDOW", 0, N_("Audio Window"), ""}, - {SPACE_ACTION, "DOPESHEET_EDITOR", 0, N_("DopeSheet Editor"), ""}, - {SPACE_NLA, "NLA_EDITOR", 0, N_("NLA Editor"), ""}, - {SPACE_SCRIPT, "SCRIPTS_WINDOW", 0, N_("Scripts Window"), ""}, - {SPACE_TIME, "TIMELINE", 0, N_("Timeline"), ""}, - {SPACE_NODE, "NODE_EDITOR", 0, N_("Node Editor"), ""}, - {SPACE_LOGIC, "LOGIC_EDITOR", 0, N_("Logic Editor"), ""}, - {SPACE_CONSOLE, "CONSOLE", 0, N_("Python Console"), ""}, - {SPACE_USERPREF, "USER_PREFERENCES", 0, N_("User Preferences"), ""}, + {SPACE_SOUND, "AUDIO_WINDOW", 0, "Audio Window", ""}, + {SPACE_ACTION, "DOPESHEET_EDITOR", 0, "DopeSheet Editor", ""}, + {SPACE_NLA, "NLA_EDITOR", 0, "NLA Editor", ""}, + {SPACE_SCRIPT, "SCRIPTS_WINDOW", 0, "Scripts Window", ""}, + {SPACE_TIME, "TIMELINE", 0, "Timeline", ""}, + {SPACE_NODE, "NODE_EDITOR", 0, "Node Editor", ""}, + {SPACE_LOGIC, "LOGIC_EDITOR", 0, "Logic Editor", ""}, + {SPACE_CONSOLE, "CONSOLE", 0, "Python Console", ""}, + {SPACE_USERPREF, "USER_PREFERENCES", 0, "User Preferences", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem draw_channels_items[] = { - {0, "COLOR", ICON_IMAGE_RGB, N_("Color"), N_("Draw image with RGB colors")}, - {SI_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, N_("Color and Alpha"), N_("Draw image with RGB colors and alpha transparency")}, - {SI_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, N_("Alpha"), N_("Draw alpha transparency channel")}, - {SI_SHOW_ZBUF, "Z_BUFFER", ICON_IMAGE_ZDEPTH, N_("Z-Buffer"), N_("Draw Z-buffer associated with image (mapped from camera clip start to end)")}, + {0, "COLOR", ICON_IMAGE_RGB, "Color", "Draw image with RGB colors"}, + {SI_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha", "Draw image with RGB colors and alpha transparency"}, + {SI_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Draw alpha transparency channel"}, + {SI_SHOW_ZBUF, "Z_BUFFER", ICON_IMAGE_ZDEPTH, "Z-Buffer", "Draw Z-buffer associated with image (mapped from camera clip start to end)"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem transform_orientation_items[] = { - {V3D_MANIP_GLOBAL, "GLOBAL", 0, N_("Global"), N_("Align the transformation axes to world space")}, - {V3D_MANIP_LOCAL, "LOCAL", 0, N_("Local"), N_("Align the transformation axes to the selected objects' local space")}, - {V3D_MANIP_GIMBAL, "GIMBAL", 0, N_("Gimbal"), N_("Align each axis to the Euler rotation axis as used for input")}, - {V3D_MANIP_NORMAL, "NORMAL", 0, N_("Normal"), N_("Align the transformation axes to average normal of selected elements (bone Y axis for pose mode)")}, - {V3D_MANIP_VIEW, "VIEW", 0, N_("View"), N_("Align the transformation axes to the window")}, - {V3D_MANIP_CUSTOM, "CUSTOM", 0, N_("Custom"), N_("Use a custom transform orientation")}, + {V3D_MANIP_GLOBAL, "GLOBAL", 0, "Global", "Align the transformation axes to world space"}, + {V3D_MANIP_LOCAL, "LOCAL", 0, "Local", "Align the transformation axes to the selected objects' local space"}, + {V3D_MANIP_GIMBAL, "GIMBAL", 0, "Gimbal", "Align each axis to the Euler rotation axis as used for input"}, + {V3D_MANIP_NORMAL, "NORMAL", 0, "Normal", "Align the transformation axes to average normal of selected elements (bone Y axis for pose mode)"}, + {V3D_MANIP_VIEW, "VIEW", 0, "View", "Align the transformation axes to the window"}, + {V3D_MANIP_CUSTOM, "CUSTOM", 0, "Custom", "Use a custom transform orientation"}, {0, NULL, 0, NULL, NULL}}; EnumPropertyItem autosnap_items[] = { - {SACTSNAP_OFF, "NONE", 0, N_("No Auto-Snap"), ""}, - {SACTSNAP_STEP, "STEP", 0, N_("Time Step"), N_("Snap to 1.0 frame/second intervals")}, - {SACTSNAP_FRAME, "FRAME", 0, N_("Nearest Frame"), N_("Snap to actual frames/seconds (nla-action time)")}, - {SACTSNAP_MARKER, "MARKER", 0, N_("Nearest Marker"), N_("Snap to nearest marker")}, + {SACTSNAP_OFF, "NONE", 0, "No Auto-Snap", ""}, + {SACTSNAP_STEP, "STEP", 0, "Time Step", "Snap to 1.0 frame/second intervals"}, + {SACTSNAP_FRAME, "FRAME", 0, "Nearest Frame", "Snap to actual frames/seconds (nla-action time)"}, + {SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker"}, {0, NULL, 0, NULL, NULL}}; EnumPropertyItem viewport_shade_items[] = { - {OB_BOUNDBOX, "BOUNDBOX", ICON_BBOX, N_("Bounding Box"), N_("Display the object's local bounding boxes only")}, - {OB_WIRE, "WIREFRAME", ICON_WIRE, N_("Wireframe"), N_("Display the object as wire edges")}, - {OB_SOLID, "SOLID", ICON_SOLID, N_("Solid"), N_("Display the object solid, lit with default OpenGL lights")}, + {OB_BOUNDBOX, "BOUNDBOX", ICON_BBOX, "Bounding Box", "Display the object's local bounding boxes only"}, + {OB_WIRE, "WIREFRAME", ICON_WIRE, "Wireframe", "Display the object as wire edges"}, + {OB_SOLID, "SOLID", ICON_SOLID, "Solid", "Display the object solid, lit with default OpenGL lights"}, //{OB_SHADED, "SHADED", ICON_SMOOTH, "Shaded", "Display the object solid, with preview shading interpolated at vertices"}, - {OB_TEXTURE, "TEXTURED", ICON_POTATO, N_("Textured"), N_("Display the object solid, with face-assigned textures")}, + {OB_TEXTURE, "TEXTURED", ICON_POTATO, "Textured", "Display the object solid, with face-assigned textures"}, {0, NULL, 0, NULL, NULL}}; #ifdef RNA_RUNTIME @@ -925,14 +923,14 @@ static void rna_def_space(BlenderRNA *brna) srna= RNA_def_struct(brna, "Space", NULL); RNA_def_struct_sdna(srna, "SpaceLink"); - RNA_def_struct_ui_text(srna, N_("Space"), N_("Space data for a screen area")); + RNA_def_struct_ui_text(srna, "Space", "Space data for a screen area"); RNA_def_struct_refine_func(srna, "rna_Space_refine"); prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "spacetype"); RNA_def_property_enum_items(prop, space_type_items); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, N_("Type"), N_("Space data type")); + RNA_def_property_ui_text(prop, "Type", "Space data type"); } static void rna_def_space_image_uv(BlenderRNA *brna) @@ -941,111 +939,111 @@ static void rna_def_space_image_uv(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem sticky_mode_items[] = { - {SI_STICKY_DISABLE, "DISABLED", ICON_STICKY_UVS_DISABLE, N_("Disabled"), N_("Sticky vertex selection disabled")}, - {SI_STICKY_LOC, "SHARED_LOCATION", ICON_STICKY_UVS_LOC, N_("Shared Location"), N_("Select UVs that are at the same location and share a mesh vertex")}, - {SI_STICKY_VERTEX, "SHARED_VERTEX", ICON_STICKY_UVS_VERT, N_("Shared Vertex"), N_("Select UVs that share mesh vertex, irrespective if they are in the same location")}, + {SI_STICKY_DISABLE, "DISABLED", ICON_STICKY_UVS_DISABLE, "Disabled", "Sticky vertex selection disabled"}, + {SI_STICKY_LOC, "SHARED_LOCATION", ICON_STICKY_UVS_LOC, "Shared Location", "Select UVs that are at the same location and share a mesh vertex"}, + {SI_STICKY_VERTEX, "SHARED_VERTEX", ICON_STICKY_UVS_VERT, "Shared Vertex", "Select UVs that share mesh vertex, irrespective if they are in the same location"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem dt_uv_items[] = { - {SI_UVDT_OUTLINE, "OUTLINE", 0, N_("Outline"), N_("Draw white edges with black outline")}, - {SI_UVDT_DASH, "DASH", 0, N_("Dash"), N_("Draw dashed black-white edges")}, - {SI_UVDT_BLACK, "BLACK", 0, N_("Black"), N_("Draw black edges")}, - {SI_UVDT_WHITE, "WHITE", 0, N_("White"), N_("Draw white edges")}, + {SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Draw white edges with black outline"}, + {SI_UVDT_DASH, "DASH", 0, "Dash", "Draw dashed black-white edges"}, + {SI_UVDT_BLACK, "BLACK", 0, "Black", "Draw black edges"}, + {SI_UVDT_WHITE, "WHITE", 0, "White", "Draw white edges"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem dt_uvstretch_items[] = { - {SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, N_("Angle"), N_("Angular distortion between UV and 3D angles")}, - {SI_UVDT_STRETCH_AREA, "AREA", 0, N_("Area"), N_("Area distortion between UV and 3D faces")}, + {SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, "Angle", "Angular distortion between UV and 3D angles"}, + {SI_UVDT_STRETCH_AREA, "AREA", 0, "Area", "Area distortion between UV and 3D faces"}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem pivot_items[] = { - {V3D_CENTER, "CENTER", ICON_ROTATE, N_("Bounding Box Center"), ""}, - {V3D_CENTROID, "MEDIAN", ICON_ROTATECENTER, N_("Median Point"), ""}, - {V3D_CURSOR, "CURSOR", ICON_CURSOR, N_("2D Cursor"), ""}, + {V3D_CENTER, "CENTER", ICON_ROTATE, "Bounding Box Center", ""}, + {V3D_CENTROID, "MEDIAN", ICON_ROTATECENTER, "Median Point", ""}, + {V3D_CURSOR, "CURSOR", ICON_CURSOR, "2D Cursor", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "SpaceUVEditor", NULL); RNA_def_struct_sdna(srna, "SpaceImage"); RNA_def_struct_nested(brna, srna, "SpaceImageEditor"); - RNA_def_struct_ui_text(srna, N_("Space UV Editor"), N_("UV editor data for the image editor space")); + RNA_def_struct_ui_text(srna, "Space UV Editor", "UV editor data for the image editor space"); /* selection */ prop= RNA_def_property(srna, "sticky_select_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "sticky"); RNA_def_property_enum_items(prop, sticky_mode_items); - RNA_def_property_ui_text(prop, N_("Sticky Selection Mode"), N_("Automatically select also UVs sharing the same vertex as the ones being selected")); + RNA_def_property_ui_text(prop, "Sticky Selection Mode", "Automatically select also UVs sharing the same vertex as the ones being selected"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); /* drawing */ prop= RNA_def_property(srna, "edge_draw_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt_uv"); RNA_def_property_enum_items(prop, dt_uv_items); - RNA_def_property_ui_text(prop, N_("Edge Draw Type"), N_("Draw type for drawing UV edges")); + RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for drawing UV edges"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "show_smooth_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_SMOOTH_UV); - RNA_def_property_ui_text(prop, N_("Draw Smooth Edges"), N_("Draw UV edges anti-aliased")); + RNA_def_property_ui_text(prop, "Draw Smooth Edges", "Draw UV edges anti-aliased"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "show_stretch", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_STRETCH); - RNA_def_property_ui_text(prop, N_("Draw Stretch"), N_("Draw faces colored according to the difference in shape between UVs and their 3D coordinates (blue for low distortion, red for high distortion)")); + RNA_def_property_ui_text(prop, "Draw Stretch", "Draw faces colored according to the difference in shape between UVs and their 3D coordinates (blue for low distortion, red for high distortion)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "draw_stretch_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt_uvstretch"); RNA_def_property_enum_items(prop, dt_uvstretch_items); - RNA_def_property_ui_text(prop, N_("Draw Stretch Type"), N_("Type of stretch to draw")); + RNA_def_property_ui_text(prop, "Draw Stretch Type", "Type of stretch to draw"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "show_modified_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAWSHADOW); - RNA_def_property_ui_text(prop, N_("Draw Modified Edges"), N_("Draw edges after modifiers are applied")); + RNA_def_property_ui_text(prop, "Draw Modified Edges", "Draw edges after modifiers are applied"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "show_other_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_OTHER); - RNA_def_property_ui_text(prop, N_("Draw Other Objects"), N_("Draw other selected objects that share the same image")); + RNA_def_property_ui_text(prop, "Draw Other Objects", "Draw other selected objects that share the same image"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "show_normalized_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_COORDFLOATS); - RNA_def_property_ui_text(prop, N_("Normalized Coordinates"), N_("Display UV coordinates from 0.0 to 1.0 rather than in pixels")); + RNA_def_property_ui_text(prop, "Normalized Coordinates", "Display UV coordinates from 0.0 to 1.0 rather than in pixels"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SI_NO_DRAWFACES); - RNA_def_property_ui_text(prop, N_("Draw Faces"), N_("Draw faces over the image")); + RNA_def_property_ui_text(prop, "Draw Faces", "Draw faces over the image"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ); RNA_def_property_array(prop, 2); RNA_def_property_float_funcs(prop, "rna_SpaceImageEditor_cursor_location_get", "rna_SpaceImageEditor_cursor_location_set", NULL); - RNA_def_property_ui_text(prop, N_("2D Cursor Location"), N_("2D cursor location for this view")); + RNA_def_property_ui_text(prop, "2D Cursor Location", "2D cursor location for this view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); /* todo: move edge and face drawing options here from G.f */ prop= RNA_def_property(srna, "use_snap_to_pixels", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_PIXELSNAP); - RNA_def_property_ui_text(prop, N_("Snap to Pixels"), N_("Snap UVs to pixel locations while editing")); + RNA_def_property_ui_text(prop, "Snap to Pixels", "Snap UVs to pixel locations while editing"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "lock_bounds", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_CLIP_UV); - RNA_def_property_ui_text(prop, N_("Constrain to Image Bounds"), N_("Constraint to stay within the image bounds while editing")); + RNA_def_property_ui_text(prop, "Constrain to Image Bounds", "Constraint to stay within the image bounds while editing"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "use_live_unwrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_LIVE_UNWRAP); - RNA_def_property_ui_text(prop, N_("Live Unwrap"), N_("Continuously unwrap the selected UV island while transforming pinned vertices")); + RNA_def_property_ui_text(prop, "Live Unwrap", "Continuously unwrap the selected UV island while transforming pinned vertices"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); prop= RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "around"); RNA_def_property_enum_items(prop, pivot_items); - RNA_def_property_ui_text(prop, N_("Pivot"), N_("Rotation/Scaling Pivot")); + RNA_def_property_ui_text(prop, "Pivot", "Rotation/Scaling Pivot"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); } @@ -1055,18 +1053,18 @@ static void rna_def_space_outliner(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem display_mode_items[] = { - {SO_ALL_SCENES, "ALL_SCENES", 0, N_("All Scenes"), N_("Display datablocks in all scenes")}, - {SO_CUR_SCENE, "CURRENT_SCENE", 0, N_("Current Scene"), N_("Display datablocks in current scene")}, - {SO_VISIBLE, "VISIBLE_LAYERS", 0, N_("Visible Layers"), N_("Display datablocks in visible layers")}, - {SO_SELECTED, "SELECTED", 0, N_("Selected"), N_("Display datablocks of selected objects")}, - {SO_ACTIVE, "ACTIVE", 0, N_("Active"), N_("Display datablocks of active object")}, - {SO_SAME_TYPE, "SAME_TYPES", 0, N_("Same Types"), N_("Display datablocks of all objects of same type as selected object")}, - {SO_GROUPS, "GROUPS", 0, N_("Groups"), N_("Display groups and their datablocks")}, - {SO_LIBRARIES, "LIBRARIES", 0, N_("Libraries"), N_("Display libraries")}, - {SO_SEQUENCE, "SEQUENCE", 0, N_("Sequence"), N_("Display sequence datablocks")}, - {SO_DATABLOCKS, "DATABLOCKS", 0, N_("Datablocks"), N_("Display raw datablocks")}, - {SO_USERDEF, "USER_PREFERENCES", 0, N_("User Preferences"), N_("Display the user preference datablocks")}, - {SO_KEYMAP, "KEYMAPS", 0, N_("Key Maps"), N_("Display keymap datablocks")}, + {SO_ALL_SCENES, "ALL_SCENES", 0, "All Scenes", "Display datablocks in all scenes"}, + {SO_CUR_SCENE, "CURRENT_SCENE", 0, "Current Scene", "Display datablocks in current scene"}, + {SO_VISIBLE, "VISIBLE_LAYERS", 0, "Visible Layers", "Display datablocks in visible layers"}, + {SO_SELECTED, "SELECTED", 0, "Selected", "Display datablocks of selected objects"}, + {SO_ACTIVE, "ACTIVE", 0, "Active", "Display datablocks of active object"}, + {SO_SAME_TYPE, "SAME_TYPES", 0, "Same Types", "Display datablocks of all objects of same type as selected object"}, + {SO_GROUPS, "GROUPS", 0, "Groups", "Display groups and their datablocks"}, + {SO_LIBRARIES, "LIBRARIES", 0, "Libraries", "Display libraries"}, + {SO_SEQUENCE, "SEQUENCE", 0, "Sequence", "Display sequence datablocks"}, + {SO_DATABLOCKS, "DATABLOCKS", 0, "Datablocks", "Display raw datablocks"}, + {SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display the user preference datablocks"}, + {SO_KEYMAP, "KEYMAPS", 0, "Key Maps", "Display keymap datablocks"}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "SpaceOutliner", "Space"); @@ -1076,27 +1074,27 @@ static void rna_def_space_outliner(BlenderRNA *brna) prop= RNA_def_property(srna, "display_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "outlinevis"); RNA_def_property_enum_items(prop, display_mode_items); - RNA_def_property_ui_text(prop, N_("Display Mode"), N_("Type of information to display")); + RNA_def_property_ui_text(prop, "Display Mode", "Type of information to display"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); prop= RNA_def_property(srna, "filter_text", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "search_string"); - RNA_def_property_ui_text(prop, N_("Display Filter"), N_("Live search filtering string")); + RNA_def_property_ui_text(prop, "Display Filter", "Live search filtering string"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); prop= RNA_def_property(srna, "use_filter_case_sensitive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "search_flags", SO_FIND_CASE_SENSITIVE); - RNA_def_property_ui_text(prop, N_("Case Sensitive Matches Only"), N_("Only use case sensitive matches of search string")); + RNA_def_property_ui_text(prop, "Case Sensitive Matches Only", "Only use case sensitive matches of search string"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); prop= RNA_def_property(srna, "use_filter_complete", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "search_flags", SO_FIND_COMPLETE); - RNA_def_property_ui_text(prop, N_("Complete Matches Only"), N_("Only use complete matches of search string")); + RNA_def_property_ui_text(prop, "Complete Matches Only", "Only use complete matches of search string"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); prop= RNA_def_property(srna, "show_restrict_columns", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_HIDE_RESTRICTCOLS); - RNA_def_property_ui_text(prop, N_("Show Restriction Columns"), N_("Show column")); + RNA_def_property_ui_text(prop, "Show Restriction Columns", "Show column"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); } @@ -1107,71 +1105,71 @@ static void rna_def_background_image(BlenderRNA *brna) /* note: combinations work but dont flip so arnt that useful */ static EnumPropertyItem bgpic_axis_items[] = { - {0, "", 0, N_("X Axis"), ""}, - {(1<