[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40965] branches/soc-2011-tomato: Merging trunk up to rev 40959

Sergey Sharybin g.ulairi at gmail.com
Wed Oct 12 18:28:42 CEST 2011 

Revision: 40965
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40965
Author:   nazgul
Date:     2011-10-12 16:28:42 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Merging trunk up to rev 40959

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40959

Modified Paths:
--------------
    branches/soc-2011-tomato/doc/build_systems/scons-dev.txt
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/po/POTFILES.in
    branches/soc-2011-tomato/po/README.txt
    branches/soc-2011-tomato/po/ar.po
    branches/soc-2011-tomato/po/bg.po
    branches/soc-2011-tomato/po/ca.po
    branches/soc-2011-tomato/po/cs.po
    branches/soc-2011-tomato/po/de.po
    branches/soc-2011-tomato/po/el.po
    branches/soc-2011-tomato/po/es.po
    branches/soc-2011-tomato/po/fi.po
    branches/soc-2011-tomato/po/fr.po
    branches/soc-2011-tomato/po/hr.po
    branches/soc-2011-tomato/po/it.po
    branches/soc-2011-tomato/po/ja.po
    branches/soc-2011-tomato/po/ko.po
    branches/soc-2011-tomato/po/ne.po
    branches/soc-2011-tomato/po/nl.po
    branches/soc-2011-tomato/po/pl.po
    branches/soc-2011-tomato/po/pt_BR.po
    branches/soc-2011-tomato/po/ro.po
    branches/soc-2011-tomato/po/ru.po
    branches/soc-2011-tomato/po/sr.po
    branches/soc-2011-tomato/po/sr at Latn.po
    branches/soc-2011-tomato/po/sv.po
    branches/soc-2011-tomato/po/uk.po
    branches/soc-2011-tomato/po/zh_CN.po
    branches/soc-2011-tomato/po/zh_TW.po
    branches/soc-2011-tomato/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
    branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/space_info.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
    branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c

Added Paths:
-----------
    branches/soc-2011-tomato/po/fa.po
    branches/soc-2011-tomato/release/bin/.blender/locale/fa/
    branches/soc-2011-tomato/release/bin/.blender/locale/fa/LC_MESSAGES/
    branches/soc-2011-tomato/release/bin/.blender/locale/fa/LC_MESSAGES/blender.mo

Removed Paths:
-------------
    branches/soc-2011-tomato/release/bin/.blender/locale/fa/LC_MESSAGES/
    branches/soc-2011-tomato/release/bin/.blender/locale/fa/LC_MESSAGES/blender.mo

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/po/el.po
    branches/soc-2011-tomato/po/ko.po
    branches/soc-2011-tomato/po/ne.po
    branches/soc-2011-tomato/po/zh_TW.po
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40911
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40959

Modified: branches/soc-2011-tomato/doc/build_systems/scons-dev.txt
===================================================================
--- branches/soc-2011-tomato/doc/build_systems/scons-dev.txt	2011-10-12 16:09:35 UTC (rev 40964)
+++ branches/soc-2011-tomato/doc/build_systems/scons-dev.txt	2011-10-12 16:28:42 UTC (rev 40965)
@@ -189,6 +189,6 @@
     need changes elsewhere in the system, as it is handled automatically
     with the central library repository.
 
-    Enjoy the new system!
+    Enjoy the new system!!
 
     /Nathan Letwory (jesterKing)

Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py	2011-10-12 16:09:35 UTC (rev 40964)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py	2011-10-12 16:28:42 UTC (rev 40965)
@@ -1042,7 +1042,9 @@
         fw("html_theme = 'blender-org'\n")
         fw("html_theme_path = ['../']\n")
 
-    fw("html_favicon = 'favicon.ico'\n")
+        # copied with the theme, exclude else we get an error [#28873]
+        fw("html_favicon = 'favicon.ico'\n")
+
     # not helpful since the source us generated, adds to upload size.
     fw("html_copy_source = False\n")
     fw("\n")

Modified: branches/soc-2011-tomato/po/POTFILES.in
===================================================================
--- branches/soc-2011-tomato/po/POTFILES.in	2011-10-12 16:09:35 UTC (rev 40964)
+++ branches/soc-2011-tomato/po/POTFILES.in	2011-10-12 16:28:42 UTC (rev 40965)
@@ -192,27 +192,7 @@
 source/blender/editors/uvedit/uvedit_ops.c
 source/blender/editors/uvedit/uvedit_unwrap_ops.c
 
-source/blender/makesrna/intern/rna_ID.c
-source/blender/makesrna/intern/rna_action.c
-source/blender/makesrna/intern/rna_color.c
-source/blender/makesrna/intern/rna_constraint.c
-source/blender/makesrna/intern/rna_curve.c
-source/blender/makesrna/intern/rna_fcurve.c
-source/blender/makesrna/intern/rna_material.c
-source/blender/makesrna/intern/rna_mesh.c
-source/blender/makesrna/intern/rna_modifier.c
-source/blender/makesrna/intern/rna_object.c
-source/blender/makesrna/intern/rna_object_force.c
-source/blender/makesrna/intern/rna_particle.c
-source/blender/makesrna/intern/rna_render.c
-source/blender/makesrna/intern/rna_scene.c
-source/blender/makesrna/intern/rna_space.c
-source/blender/makesrna/intern/rna_texture.c
-source/blender/makesrna/intern/rna_ui_api.c
 source/blender/makesrna/intern/rna_userdef.c
-source/blender/makesrna/intern/rna_wm.c
-source/blender/makesrna/intern/rna_wm_api.c
-source/blender/makesrna/intern/rna_world.c
 
 source/blender/windowmanager/intern/wm_files.c
 source/blender/windowmanager/intern/wm_operators.c

Modified: branches/soc-2011-tomato/po/README.txt
===================================================================
--- branches/soc-2011-tomato/po/README.txt	2011-10-12 16:09:35 UTC (rev 40964)
+++ branches/soc-2011-tomato/po/README.txt	2011-10-12 16:28:42 UTC (rev 40965)
@@ -6,7 +6,7 @@
 1. How it works
 ---------------
 
-This folder contains source files for translation system. This source files have
+This folder contains source files for translation system. These source files have
 got .po extension and they've got pretty simple syntax:
 
 msgid "some message id"
@@ -16,9 +16,9 @@
 and so it'll be displayed on the screen as "translation for this message".
 Pretty simple.
 
-This source files are pre-compiled into ../relese/bin/.blender/locale/<language>/LC_MESSAGES/blender.mo,
-so they aren't getting compiled every time Blender is compiling to same some time and prevent
-failure on systems which doesn't have needed tools for compiling .po files.
+This source files are pre-compiled into ../release/bin/.blender/locale/<language>/LC_MESSAGES/blender.mo,
+so they aren't getting compiled every time Blender is compiling to save some time and prevent
+failure on systems which don't have needed tools for compiling .po files.
 
 2. How to update translations
 -----------------------------
@@ -32,7 +32,7 @@
 msgstr "translation for this message"
 
 it means translation used to exist for this message, but message was changed, so translation
-also have to be updated (it's easier to make new translation based on previos translation).
+also have to be updated (it's easier to make new translation based on previous translation).
 When translation was updated, remove line with '#, fuzzy' and it'll work.
 
 If there's no message in .po file you want to translate, probably .po file should be updated.
@@ -46,7 +46,7 @@
 - Run update_po.py script to merge all .po files with blender.pot (so all .po files
   will contain all msgid-s declared in blender.pot) or update_po.py <language> to
   update only needed .po file(s) to save time when you're busy with translation.
-  But before ocmmit all .po files better be updated.
+  But before commit all .po files better be updated.
 
 When you've finished with translation, you should re-compile .po file into .mo file.
 It's also pretty simple: just run update_mo.py script to recompile all languages or
@@ -54,7 +54,7 @@
 
 NOTE: msgfmt, msgmerge and xgettext tools should be available in your PATH.
 
-This steps to update template, translation files and compile them can be made in "batch" mode
+These steps to update template, translation files and compile them can be made in "batch" mode
 using GNUMakefile:
 
 make -f GNUMakefile translations
@@ -65,7 +65,7 @@
 3. Note for Windows users
 -------------------------
 You can find compiled builds of gettext in the lib folder under "binaries\gettext\" for both windows and win64.
-In order to run the scripts you will need to replace the location of the GETTEXT_..._EXeCUTABLE.
+In order to run the scripts you will need to replace the location of the GETTEXT_..._EXECUTABLE.
 
 For example in update_pot.py:
 -GETTEXT_XGETTEXT_EXECUTABLE = "xgettext"
@@ -77,5 +77,5 @@
 - check_po.py: this script checks if all messages declared in blender.pot exists in.po files
                and that no extra messages are declared in .po files
 - clean_po.py: this script removes all commented messages which aren't required by .pot file anymore.
-- merge_po.py: this scripts accepts two files as arguments and copies translations from second file
+- merge_po.py: this script accepts two files as arguments and copies translations from second file
                into first file.

Modified: branches/soc-2011-tomato/po/ar.po
===================================================================
--- branches/soc-2011-tomato/po/ar.po	2011-10-12 16:09:35 UTC (rev 40964)
+++ branches/soc-2011-tomato/po/ar.po	2011-10-12 16:28:42 UTC (rev 40965)
@@ -1,3 +1,7 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Blender\n"
@@ -2,6 +6,6 @@
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-30 15:00+0600\n"
-"PO-Revision-Date: 2006-11-14 15:33+0300\n"
-"Last-Translator: M. Bashir Al-Noimi <bashir.storm at gmail.com>\n"
-"Language-Team: arabeyes.org <bashir.storm at gmail.com>\n"
+"POT-Creation-Date: 2011-10-11 14:24+0800\n"
+"PO-Revision-Date: 2011-09-30 14:41-0000\n"
+"Last-Translator: Yousef Harfoush, Amine Moussaoui\n"
+"Language-Team: batProject <bat3a at msn.com>\n"
 "Language: ar\n"
@@ -11,2827 +15,2584 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Arabic\n"
-"X-Poedit-Country: SYRIAN ARAB REPUBLIC\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Country: JORDAN\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
-#: bpy.types.OUTLINER_OT_group_operation.type
-#, fuzzy
-msgid "Group Operation"
-msgstr "مسح التدوير"
+#: source/blender/editors/armature/poselib.c:412
+msgid "Add New"
+msgstr ""
 
-#: bpy.types.SequenceProxy.build_75
-msgid "Build 75% proxy resolution"
+#: source/blender/editors/armature/poselib.c:417
+msgid "Add New (Current Frame)"
 msgstr ""
 
-#: bpy.types.Event.type, 'MEDIA_STOP' bpy.types.KeyMapItem.key_modifier,
-#: bpy.types.KeyMapItem.type,
-msgid "Media Stop"
+#: source/blender/editors/armature/poselib.c:420
+msgid "Replace Existing..."
 msgstr ""
 
-#: bpy.types.SpaceSequenceEditor
-#, fuzzy
-msgid "Space Sequence Editor"
-msgstr "بدء سلسلة الاخراج"
+#: source/blender/editors/interface/interface_layout.c:2811
+msgid "No Properties"
+msgstr ""
 
-#: bpy.types.Event.type, 'RIGHTMOUSE' bpy.types.KeyMapItem.key_modifier,
-#: bpy.types.KeyMapItem.type,
-#, fuzzy
-msgid "Right Mouse"
-msgstr "الجهة العليا اليمنى"
+#: source/blender/editors/interface/interface_regions.c:413
+#, c-format
+msgid "Shortcut: %s"
+msgstr ""
 
-# ##########################################################
-# ##
-# ##  ToolBox >> OBJECT (2)
-# ##
-# ##########################################################
-#: bpy.types.OUTLINER_OT_show_active
-#, fuzzy
-msgid "Show Active"
-msgstr "نقل لطبقة"
+#: source/blender/editors/interface/interface_regions.c:423
+#, c-format
+msgid "Value: %s"
+msgstr ""
 
-#: bpy.types.MESH_OT_screw
-msgid ""
-"Extrude selected vertices in screw-shaped rotation around the cursor in "
-"indicated viewport"
+#: source/blender/editors/interface/interface_regions.c:435
+#, c-format
+msgid "Radians: %f"
 msgstr ""
 
-# ##########################################################
-# ##
-# ##  Menu bar
-# ##
-# ##########################################################
-#: bpy.types.ThemeFileBrowser.tiles
-#, fuzzy
-msgid "Tiles"
-msgstr "ملف"
+#: source/blender/editors/interface/interface_regions.c:444
+#, c-format
+msgid "Expression: %s"
+msgstr ""
 
-#: bpy.types.ActionGroup.custom_color
-msgid "Index of custom color set"
+#: source/blender/editors/interface/interface_regions.c:452
+#, c-format
+msgid "Python: %s.%s"
 msgstr ""
 
-#: bpy.types.FileSelectParams.use_filter_movie
-msgid "Filter Movies"
+#: source/blender/editors/interface/interface_regions.c:460
+#, c-format
+msgid "Library: %s"
 msgstr ""
 
-# ##########################################################
-# ##
-# ##  ToolBox >> RENDER
-# ##
-# ##########################################################

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list