[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22131] branches/blender2.5/blender: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22099 :22130

Campbell Barton ideasman42 at gmail.com
Sun Aug 2 05:59:01 CEST 2009


Revision: 22131
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22131
Author:   campbellbarton
Date:     2009-08-02 05:59:00 +0200 (Sun, 02 Aug 2009)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22099:22130

Modified Paths:
--------------
    branches/blender2.5/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.h
    branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/blender2.5/blender/po/ja.po
    branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
    branches/blender2.5/blender/source/blender/imbuf/intern/targa.c
    branches/blender2.5/blender/source/blender/makesdna/intern/makesdna.c
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp

Modified: branches/blender2.5/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2009-08-02 03:41:42 UTC (rev 22130)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2009-08-02 03:59:00 UTC (rev 22131)
@@ -155,11 +155,9 @@
 	GHOST_TSuccess success = GHOST_System::init();
 
 	if (success) {
-		m_keyboard_vector = new char[32];
-
 		m_displayManager = new GHOST_DisplayManagerX11(this);
 
-		if (m_keyboard_vector && m_displayManager) {
+		if (m_displayManager) {
 			return GHOST_kSuccess;
 		}
 	}
@@ -715,9 +713,9 @@
 
 	// analyse the masks retuned from XQueryPointer.
 
-	memset(m_keyboard_vector,0,sizeof(m_keyboard_vector));
+	memset((void *)m_keyboard_vector,0,sizeof(m_keyboard_vector));
 
-	XQueryKeymap(m_display,m_keyboard_vector);
+	XQueryKeymap(m_display,(char *)m_keyboard_vector);
 
 	// now translate key symobols into keycodes and
 	// test with vector.

Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.h	2009-08-02 03:41:42 UTC (rev 22130)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.h	2009-08-02 03:59:00 UTC (rev 22131)
@@ -258,7 +258,7 @@
 	GHOST_TUns64 m_start_time;
 
 	/// A vector of keyboard key masks
-	char *m_keyboard_vector;
+	char m_keyboard_vector[32];
 
 	/**
 	 * Return the ghost window associated with the

Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2009-08-02 03:41:42 UTC (rev 22130)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2009-08-02 03:59:00 UTC (rev 22131)
@@ -187,6 +187,8 @@
 		printf("%s:%d: X11 glxChooseVisual() failed for OpenGL, verify working openGL system!\n", __FILE__, __LINE__);
 		return;
 	}
+	
+	memset(&m_xtablet, 0, sizeof(m_xtablet));
 
 	// Create a bunch of attributes needed to create an X window.
 

Modified: branches/blender2.5/blender/po/ja.po
===================================================================
--- branches/blender2.5/blender/po/ja.po	2009-08-02 03:41:42 UTC (rev 22130)
+++ branches/blender2.5/blender/po/ja.po	2009-08-02 03:59:00 UTC (rev 22131)
@@ -1,490 +1,14877 @@
-# blender ja.po
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# snts <snutlix at hotmail.com>, 2003.
-#
+### System ###
+msgid " OK? "
+msgstr ""
 
-###########################################################
-###
-###  Render Window
-###
-###########################################################
-msgid "Start the rendering"
-msgstr "レンダリング開始"
-msgid "Display edge settings"
-msgstr "エッジの設定"
-msgid "Enable shadow calculation"
-msgstr "影を有効にする"
+msgid " Error "
+msgstr "エラー"
 
+msgid "Error"
+msgstr "エラー"
 
-###########################################################
-###
-###  ToolBox (Popup Menu)
-###
-###########################################################
-msgid "ADD"
-msgstr "オブジェ追加"
-msgid "FILE"
-msgstr "ファイル"
-msgid "EDIT"
-msgstr "オブジェ編集"
-msgid "OBJECT"
-msgstr "オブジェクト"
-msgid "MESH"
-msgstr "メッシュ"
-msgid "CURVE"
-msgstr "曲線"
-msgid "KEY"
-msgstr "キー"
-msgid "VIEW"
-msgstr "表示"
-msgid "RENDER"
-msgstr "レンダー"
-msgid "SEQUENCE"
-msgstr "シーケンス"
+msgid "Split Area"
+msgstr "エリア分割"
 
+msgid "Join Areas"
+msgstr "エリア結合"
 
-###########################################################
-###
-###  ToolBox >> ADD
-###
-###########################################################
+msgid "Add Header"
+msgstr "ヘッダー表示"
+
+msgid "Header"
+msgstr "ヘッダー"
+
+msgid "Header "
+msgstr "ヘッダー"
+
+msgid "Top"
+msgstr "上"
+
+msgid "Bottom"
+msgstr "下"
+
+msgid "Bottom "
+msgstr "下"
+
+msgid "No Header"
+msgstr "ヘッダーなし"
+
+msgid "No Header "
+msgstr "ヘッダーなし"
+
+msgid "Displays Current Window Type. Click for menu of available types."
+msgstr "現在のウィンドウ タイプ。クリックでメニューを表示します。"
+
+msgid "Window type:"
+msgstr "ウィンドウ タイプ:"
+
+msgid "3D View "
+msgstr "3Dビュー"
+
+msgid "Ipo Curve Editor "
+msgstr "Ipoカーブ エディター"
+
+msgid "Action Editor "
+msgstr "アクション"
+
+msgid "NLA Editor "
+msgstr "NLAエディター"
+
+msgid "UV/Image Editor "
+msgstr "UV/画像エディター"
+
+msgid "Video Sequence Editor "
+msgstr "ビデオ シーケンス エディター"
+
+msgid "Timeline "
+msgstr "タイムライン"
+
+msgid "Audio Window "
+msgstr "オーディオ ウィンドウ"
+
+msgid "Text Editor "
+msgstr "テキスト エディター"
+
+msgid "User Preferences "
+msgstr "ユーザー設定"
+
+msgid "Outliner "
+msgstr "アウトライナー"
+
+msgid "Buttons Window "
+msgstr "ボタン ウィンドウ"
+
+msgid "Node Editor "
+msgstr "ノード エディター"
+
+msgid "Image Browser "
+msgstr "イメージ ブラウザー"
+
+msgid "File Browser "
+msgstr "ファイル ブラウザー"
+
+msgid "Scripts Window "
+msgstr "スクリプト ウィンドウ"
+
+msgid "Hides pulldown menus"
+msgstr "プルダウン メニューを隠します"
+
+msgid "Hide pulldown menus"
+msgstr "プルダウン メニューを隠します"
+
+msgid "Enables display of pulldown menus"
+msgstr "プルダウン メニューを表示します"
+
+msgid "Show pulldown menus"
+msgstr "プルダウン メニューを表示します"
+
+### 3D View ###
+msgid "View"
+msgstr "ビュー"
+
+msgid "Transform Orientations..."
+msgstr "変形軸のカスタマイズ..."
+
+msgid "Transform Orientations"
+msgstr "変形軸のカスタマイズ"
+
+msgid "Render Preview..."
+msgstr "レンダー プレビュー"
+
+msgid "Preview"
+msgstr "プレビュー"
+
+msgid "View Properties..."
+msgstr "表示のプロパティ"
+
+msgid "View Properties"
+msgstr "表示のプロパティ"
+
+msgid "Grid:"
+msgstr "グリッド:"
+
+msgid "Set the distance between grid lines"
+msgstr "グリッド ラインの間隔を設定します"
+
+msgid "Set the number of grid lines in perspective view"
+msgstr "透視投影でのグリッド ラインの数を設定します"
+
+msgid "Set the number of grid lines"
+msgstr "太いグリッド ラインの間隔を設定します"
+
+msgid "The lens angle in perspective view"
+msgstr "透視投影でのレンズの角度を設定します"
+
+msgid "Set the beginning of the range in which 3D objects are displayed (perspective view)"
+msgstr "3Dビューの可視領域の始点を設定します (透視投影)"
+
+msgid "Set the end of the range in which 3D objects are displayed (perspective view)"
+msgstr "3Dビューの可視領域の終点を設定します (透視投影)"
+
+msgid "View Camera:"
+msgstr "ビュー カメラ"
+
+msgid "Display:"
+msgstr "表示:"
+
+msgid "Highlight selected objects with an outline, in Solid, Shaded or Textured viewport shading modes"
+msgstr "選択したオブジェクトのアウトラインをハイライト表示します"
+
+msgid "Outline Selected"
+msgstr "アウトライン"
+
+msgid "Draw the center points on all objects"
+msgstr "全てのオブジェクトの原点を表示します"
+
+msgid "All Object Centers"
+msgstr "全ての原点"
+
+msgid "Draw dashed lines indicating Parent, Constraint, or Hook relationships"
+msgstr "ペアレンツ、コンストレイント、フック関係を示す点線を表示します"
+
+msgid "Relationship Lines"
+msgstr "リレイションシップ"
+
+msgid "Display textures in Solid draw type (Shift T)"
+msgstr "ソリッド描画モードでのテクスチャ表示を有効にします (Shift+T)"
+
+msgid "Solid Tex"
+msgstr "ソリッド テクス"
+
+msgid "3D Display:"
+msgstr "3Dビュー:"
+
+msgid "Show the grid floor in free camera mode"
+msgstr "透視投影でグリッド フロアを表示します"
+
+msgid "Grid Floor"
+msgstr "グリッド フロア"
+
+msgid "Show the X Axis line"
+msgstr "X軸を表示します"
+
+msgid "X Axis"
+msgstr "X軸"
+
+msgid "Show the Y Axis line"
+msgstr "Y軸を表示します"
+
+msgid "Y Axis"
+msgstr "Y軸"
+
+msgid "Show the Z Axis line"
+msgstr "Z軸を表示します"
+
+msgid "Z Axis"
+msgstr "Z軸"
+
+msgid "3D Cursor:"
+msgstr "3Dカーソル:"
+
+msgid "X co-ordinate of the 3D cursor"
+msgstr "3DカーソルのX軸の位置"
+
+msgid "Y co-ordinate of the 3D cursor"
+msgstr "3DカーソルのY軸の位置"
+
+msgid "Z co-ordinate of the 3D cursor"
+msgstr "3DカーソルのZ軸の位置"
+
+msgid "View Locking:"
+msgstr "視点のロック:"
+
+msgid "Lock view to center to this Object"
+msgstr "視点の中心が常にこのオブジェクトになるよう固定します"
+
+msgid "If view locked to Object, use this Bone to lock to view to"
+msgstr "視点のロックにボーンを使用します"
+
+msgid "Background Image..."
+msgstr "下絵の表示..."
+
+msgid "Background Image"
+msgstr "下絵"
+
+msgid "Display an image in the background of this 3D View"
+msgstr "下絵の表示を有効にします (各ビューの平行投影時のみ表示)"
+
+msgid "Use Background Image"
+msgstr "下絵を使う"
+
+msgid "Use"
+msgstr "使用"
+
+msgid "Set the transparency of the background image"
+msgstr "下絵の透明度を指定します"
+
+msgid "Set the size (width) of the background image"
+msgstr "下絵のサイズを指定します"
+
+msgid "Set the horizontal offset of the background image"
+msgstr "下絵の水平方向へのオフセットを指定します"
+
+msgid "Set the vertical offset of the background image"
+msgstr "下絵の垂直方向へのオフセットを指定します"
+
+msgid "Grease Pencil..."
+msgstr "グリース ペンシル..."
+
+msgid "Grease Pencil"
+msgstr "グリース ペンシル"
+
+msgid "Use Grease Pencil"
+msgstr "グリース ペンシル使用"
+
+msgid "Display freehand annotations overlay over this 3D View"
+msgstr "この3Dビュー上にフリーハンドで注釈を描きます"
+
+msgid "Adds a new Grease Pencil Layer"
+msgstr "新しいレイヤーを追加します"
+
+msgid "Add New Layer"
+msgstr "新規レイヤーの追加"
+
+msgid "Interpret click-drag as new strokes"
+msgstr "クリック&ドラッグで新しいストロークを描きます"
+
+msgid "Painting cannot occur with Shift-LMB (when making selections)"
+msgstr "Shift + LMBでペイントができません (選択したとき)"
+
+msgid "New strokes are added in 3D-space"
+msgstr "3D空間に描きます"
+
+msgid "Layer cannot be modified"
+msgstr "レイヤーを変更できなくします"
+
+msgid "Visibility of layer"
+msgstr "レイヤーの表示/非表示"
+
+msgid "Short description of what this layer is for (optional)"
+msgstr "レイヤー名"
+
+msgid "Delete layer"
+msgstr "レイヤーの削除"
+
+msgid "Color to use for all strokes on this Grease Pencil Layer"
+msgstr "このレイヤーに描画するグリース ペンシルの色"
+
+msgid "Visibility of stroke (0.3 to 1.0)"
+msgstr "ストロークの濃さ"
+
+msgid "Thickness of strokes (in pixels)"
+msgstr "ストロークの太さ (ピクセル)"
+
+msgid "Ghost frames on either side of frame"
+msgstr "フレームの両端のゴースト フレームを有効にします"
+
+msgid "Onion-Skin"
+msgstr "オニオンスキン"
+
+msgid "Max number of frames on either side of active frame to show (0 = just 'first' available sketch on either side)"
+msgstr "表示されているアクティブなフレーム上の両端のフレームの最大数 (0で最初のみ表示 )"
+
+msgid "Sketch in 3D"
+msgstr "3Dスケッチ"
+
+msgid "Draw Mode"
+msgstr "描画モード"
+
+msgid "Converts this layer's strokes to geometry (Hotkey = Alt-Shift-C)"
+msgstr "このレイヤーの描画をジオメトリに変換します (Alt + Shift + C)"
+
+msgid "Convert to..."
+msgstr "変換..."
+
+msgid "Grease Pencil Convert "
+msgstr "グリース ペンシル変換"
+
+msgid "Active Layer To Path"
+msgstr "パスに変換"
+
+msgid "Active Layer to Bezier"
+msgstr "ベジエ曲線に変換"
+
+msgid "Active Layer to Armature"
+msgstr "アーマチュアに変換"
+
+msgid "Erases the last stroke from the active frame (Hotkey = Alt-XKEY/DEL)"
+msgstr "最後のストロークをアクティブなフレームから消去します (Alt + X/DEL)"
+
+msgid "Del Last Stroke"
+msgstr "最後を削除"
+
+msgid "User"
+msgstr "ユーザー視点"
+
+msgid "Camera"
+msgstr "カメラ"
+
+msgid "Front"
+msgstr "前"
+
+msgid "Side"
+msgstr "横"
+
+msgid "Cameras"
+msgstr "カメラ ビュー"
+
+msgid "Set Active Object as Active Camera"
+msgstr "選択物をアクティブなカメラにする"
+
+msgid "Camera (Active)"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list