You can subscribe to this list here.
2005 |
Jan
(84) |
Feb
(83) |
Mar
(36) |
Apr
(15) |
May
(250) |
Jun
(81) |
Jul
(29) |
Aug
(62) |
Sep
(22) |
Oct
(13) |
Nov
(62) |
Dec
(30) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(67) |
Feb
(68) |
Mar
(149) |
Apr
(51) |
May
(8) |
Jun
(23) |
Jul
(87) |
Aug
(132) |
Sep
(9) |
Oct
(1) |
Nov
(22) |
Dec
(163) |
2007 |
Jan
(74) |
Feb
(71) |
Mar
(2) |
Apr
(121) |
May
(57) |
Jun
(168) |
Jul
(151) |
Aug
(73) |
Sep
(4) |
Oct
(91) |
Nov
(30) |
Dec
(38) |
2008 |
Jan
(178) |
Feb
(159) |
Mar
(49) |
Apr
(65) |
May
(43) |
Jun
(56) |
Jul
(99) |
Aug
(132) |
Sep
(71) |
Oct
(57) |
Nov
(42) |
Dec
(11) |
2009 |
Jan
(40) |
Feb
(74) |
Mar
(80) |
Apr
(45) |
May
(86) |
Jun
(76) |
Jul
(160) |
Aug
(170) |
Sep
(227) |
Oct
(161) |
Nov
(49) |
Dec
(108) |
2010 |
Jan
(108) |
Feb
(82) |
Mar
(62) |
Apr
(33) |
May
(60) |
Jun
(38) |
Jul
(46) |
Aug
(69) |
Sep
(157) |
Oct
(123) |
Nov
(130) |
Dec
(154) |
2011 |
Jan
(138) |
Feb
(112) |
Mar
(128) |
Apr
(4) |
May
(86) |
Jun
(81) |
Jul
(128) |
Aug
(98) |
Sep
(69) |
Oct
(32) |
Nov
(50) |
Dec
(41) |
2012 |
Jan
(10) |
Feb
(6) |
Mar
(17) |
Apr
(10) |
May
(67) |
Jun
(57) |
Jul
(41) |
Aug
(54) |
Sep
(17) |
Oct
(15) |
Nov
(34) |
Dec
(45) |
2013 |
Jan
(62) |
Feb
(47) |
Mar
(71) |
Apr
(25) |
May
(11) |
Jun
|
Jul
|
Aug
|
Sep
(57) |
Oct
|
Nov
(1) |
Dec
|
2014 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(3) |
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <hug...@li...> - 2013-09-09 17:51:22
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/b1beed0cf146 changeset: 6303:b1beed0cf146 user: tmodes date: Mon Jun 10 20:16:27 2013 +0200 description: Updated Chinese translation (Ewing Kang) diffstat: src/translations/zh_TW.po | 1342 ++++++++++++++++++-------------------------- 1 files changed, 564 insertions(+), 778 deletions(-) diffs (truncated from 3837 to 500 lines): diff -r aae44c4b0570 -r b1beed0cf146 src/translations/zh_TW.po --- a/src/translations/zh_TW.po Sun Jun 09 12:29:12 2013 +0200 +++ b/src/translations/zh_TW.po Mon Jun 10 20:16:27 2013 +0200 @@ -1,24 +1,26 @@ msgid "" msgstr "" -"Project-Id-Version: for hugin 2011.2.0_rc5\n" +"Project-Id-Version: for hugin 2013.0 beta1\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" "PO-Revision-Date: \n" -"Last-Translator: Rick Langford <ru...@ya...>\n" +"Last-Translator: Ewing Kang <f03...@ya...>\n" "Language-Team: Chinese Traditional <NA>\n" -"Language: zh_TW\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Bookmarks: -1,277,-1,-1,-1,-1,-1,-1,-1,-1\n" -"X-Generator: Poedit 1.5.5\n" +"X-Poedit-Language: Chinese\n" +"X-Poedit-Country: TAIWAN\n" +"X-Poedit-Bookmarks: 1137,407,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Poedit-KeywordsList: vignetting 暗角\n" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 #, c-format msgid "" "External program %s not found as specified in preferences, reverting to " "bundled version" -msgstr "偏好設定目中未發現您所指定的外部應用程式%s, 回到內部軟體集" +msgstr "偏好設定中未發現您指定的外部程式%s, 重新換到內建版本" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57 #: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82 @@ -92,11 +94,11 @@ #: hugin1/base_wx/huginConfig.cpp:288 msgid "first image" -msgstr "第一張照片" +msgstr "第一張影像" #: hugin1/base_wx/huginConfig.cpp:289 msgid "last image" -msgstr "最後一張照片" +msgstr "最後一張影像" #: hugin1/base_wx/huginConfig.cpp:291 msgid "directory" @@ -110,11 +112,11 @@ #: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 msgid "Camera maker" -msgstr "照相機製造商" +msgstr "相機製造商:" #: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 msgid "Camera model" -msgstr "照相機型號" +msgstr "相機型號:" #: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:666 #: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 @@ -125,7 +127,7 @@ #: hugin1/base_wx/huginConfig.cpp:335 msgid "unknown projection" -msgstr "" +msgstr "未知的專案" #: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 msgid "Normal (rectilinear)" @@ -137,11 +139,11 @@ #: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:368 msgid "Circular fisheye" -msgstr "圓形魚眼" +msgstr "圓形魚眼(Circular)" #: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:369 msgid "Full frame fisheye" -msgstr "全幀魚眼" +msgstr "全幀魚眼(Full frame)" #: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:371 #: hugin1/hugin/PanoPanel.cpp:153 @@ -159,9 +161,8 @@ msgstr "Equisolid" #: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:374 -#, fuzzy msgid "Fisheye Thoby" -msgstr "魚眼" +msgstr "Thoby魚眼" #: hugin1/base_wx/LensTools.cpp:219 msgid "Load lens parameters" @@ -322,17 +323,16 @@ msgid "" "Error while running assistant\n" "%s" -msgstr "" +msgstr "執行接圖分析時發生錯誤:%s" #: hugin1/base_wx/RunStitchPanel.cpp:372 hugin1/base_wx/RunStitchPanel.cpp:380 -#, fuzzy msgid "Error during running assistant" -msgstr "接合時發生錯誤" +msgstr "接圖分析時發生錯誤" #: hugin1/base_wx/wxLensDB.cpp:233 -#, fuzzy, c-format +#, c-format msgid "The input \"%s\" is not a valid number." -msgstr "輸入[%s] 是無效的數字 ,對 %s 而言\n" +msgstr "[%s] 是無效的輸入數字" #: hugin1/base_wx/wxLensDB.cpp:294 translations/xrc.cpp:194 #: translations/xrc.cpp:211 translations/xrc.cpp:259 translations/xrc.cpp:826 @@ -344,21 +344,17 @@ #: hugin1/base_wx/wxLensDB.cpp:299 #, c-format msgid "%d lenses found." -msgstr "" +msgstr "找到 %d 個鏡頭" #: hugin1/base_wx/wxLensDB.cpp:303 -#, fuzzy msgid "No lens found." -msgstr "沒有發現相似點" +msgstr "沒有找到鏡頭" #: hugin1/base_wx/wxLensDB.cpp:609 -#, fuzzy msgid "" "There is too little information for saving data into database. Please check " "your input!" -msgstr "" -"至少有一個欄位有錯誤數值。\n" -"請檢查。" +msgstr "要存進資料庫的資訊太少,請檢查輸入!" #: hugin1/base_wx/wxLensDB.cpp:660 #, c-format @@ -369,25 +365,27 @@ "The default folder for the database files is \"%s\".\n" "Do you want to proceed anyway?" msgstr "" +"你選擇將資料庫儲存在路徑 \"%s\" \n" +"Hugin將沒有辦法在啟動時自動把其資訊載入,因為這不是預設的路徑, \n" +"預設的檔案路徑為 \"%s\" \n" +"仍然要繼續嗎?" #: hugin1/base_wx/wxLensDB.cpp:708 -#, fuzzy msgid "Save lens into database file" -msgstr "儲存鏡頭參數資訊檔案" +msgstr "把鏡頭參數存進資料庫檔案" #: hugin1/base_wx/wxLensDB.cpp:710 hugin1/base_wx/wxLensDB.cpp:948 -#, fuzzy msgid "Lensfun database files (*.xml)|*.xml" -msgstr "PTmender 檔案 (*.txt)|*.txt" +msgstr "Lensfun 資料庫檔案 (*.xml)|*.xml" #: hugin1/base_wx/wxLensDB.cpp:751 hugin1/base_wx/wxLensDB.cpp:764 #: hugin1/base_wx/wxLensDB.cpp:810 hugin1/base_wx/wxLensDB.cpp:969 msgid "Could not save information into database file." -msgstr "" +msgstr "無法把資訊存進資料庫檔案" #: hugin1/base_wx/wxLensDB.cpp:817 msgid "Could not initialize database." -msgstr "" +msgstr "無法初始化資料庫" #: hugin1/base_wx/wxLensDB.cpp:821 #, c-format @@ -397,19 +395,21 @@ "Could not proceed.\n" "(Error code: %d)" msgstr "" +"目前選擇的鏡頭不符合目前所選資料庫中關於這顆鏡頭的資訊 \n" +"程式無法繼續 \n" +"(錯誤碼: %d)" #: hugin1/base_wx/wxLensDB.cpp:920 msgid "The maker field contains only an empty string." -msgstr "" +msgstr "\"相機製造商\"欄位空白" #: hugin1/base_wx/wxLensDB.cpp:925 msgid "The model field contains only an empty string." -msgstr "" +msgstr "\"相機型號\"欄位空白" #: hugin1/base_wx/wxLensDB.cpp:946 -#, fuzzy msgid "Save camera into database file" -msgstr "儲存鏡頭參數到一個檔案" +msgstr "把相機資料存進資料庫檔案" #: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:192 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80 @@ -436,9 +436,8 @@ #: hugin1/calibrate_lens/LensCalApp.cpp:79 hugin1/hugin/huginApp.cpp:212 #: hugin1/ptbatcher/PTBatcherGUI.cpp:96 -#, fuzzy msgid "lensfun directory not found in bundle" -msgstr "xrc 目錄不存在於軟體集中" +msgstr "在軟體目錄中找不到lensfun資料庫資料夾" #: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:227 #: hugin1/ptbatcher/PTBatcherGUI.cpp:119 @@ -494,27 +493,23 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:768 #: hugin1/calibrate_lens/LensCalFrame.cpp:802 #: hugin1/calibrate_lens/LensCalFrame.cpp:874 -#, fuzzy msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." -msgstr "" -"至少有一個欄位有錯誤數值。\n" -"請檢查。" +msgstr "至少有一個無效的數值,請檢查輸入" #: hugin1/calibrate_lens/LensCalFrame.cpp:611 msgid "Detecting edges..." msgstr "偵測邊緣..." #: hugin1/calibrate_lens/LensCalFrame.cpp:613 -#, fuzzy msgid "Finding lines..." -msgstr "修改鏡頭..." +msgstr "偵測直線..." #: hugin1/calibrate_lens/LensCalFrame.cpp:617 #: hugin1/calibrate_lens/LensCalFrame.cpp:733 msgid "Finished" -msgstr "" +msgstr "完成" #: hugin1/calibrate_lens/LensCalFrame.cpp:633 msgid "" @@ -554,26 +549,22 @@ "參數。" #: hugin1/calibrate_lens/LensCalFrame.cpp:781 -#, fuzzy msgid "Save lens parameters to ini file" -msgstr "儲存鏡頭參數到一個檔案" +msgstr "儲存鏡頭參數到 .ini 檔" #: hugin1/calibrate_lens/LensCalFrame.cpp:782 #: hugin1/hugin/PanoOperation.cpp:567 -#, fuzzy msgid "Save lens parameters to lensfun database" -msgstr "儲存鏡頭參數到一個檔案" +msgstr "儲存鏡頭參數到 lensfun 資料庫" #: hugin1/calibrate_lens/LensCalFrame.cpp:783 -#, fuzzy msgid "Saving lens data" -msgstr "載入鏡頭數據..." +msgstr "儲存鏡頭參數..." #: hugin1/calibrate_lens/LensCalFrame.cpp:783 translations/xrc.cpp:276 #: xrc.cpp:276 -#, fuzzy msgid "Save lens" -msgstr "儲存鏡頭" +msgstr "儲存鏡頭..." #: hugin1/calibrate_lens/LensCalFrame.cpp:806 hugin1/hugin/MainFrame.cpp:860 msgid "Save project file" @@ -584,7 +575,7 @@ msgstr "專案檔案 (*.pto)|*.pto|全部檔案 (*)|*" #: hugin1/hugin/AboutDialog.cpp:130 -#, fuzzy, c-format +#, c-format msgid "Operating System: %s" msgstr "作業系統: %s" @@ -614,7 +605,7 @@ #: hugin1/hugin/AboutDialog.cpp:174 #, c-format msgid "Version: %s" -msgstr "版本: %s" +msgstr "版本: %s" #: hugin1/hugin/AboutDialog.cpp:175 #, c-format @@ -627,19 +618,18 @@ msgstr "資料路徑:%s" #: hugin1/hugin/AboutDialog.cpp:180 -#, fuzzy, c-format +#, c-format msgid "Path to public lensfun database: %s" -msgstr "資料路徑:%s" +msgstr "公用 lensfun 資料庫路徑:%s" #: hugin1/hugin/AboutDialog.cpp:182 -#, fuzzy, c-format +#, c-format msgid "Path to user lensfun database: %s" -msgstr "資料路徑:%s" +msgstr "使用者 lensfun 資料庫路徑:%s" #: hugin1/hugin/AboutDialog.cpp:183 -#, fuzzy msgid "Libraries" -msgstr "偵測器" +msgstr "函式庫" #: hugin1/hugin/CPDetectorDialog.cpp:93 msgid "Autopano from http://autopano.kolor.com is not available for OS X" @@ -679,19 +669,19 @@ #: hugin1/hugin/CPEditorPanel.cpp:141 msgid "left x" -msgstr "左 x" +msgstr "左圖 x" #: hugin1/hugin/CPEditorPanel.cpp:142 msgid "left y" -msgstr "左 y" +msgstr "左圖 y" #: hugin1/hugin/CPEditorPanel.cpp:143 msgid "right x" -msgstr "右 x" +msgstr "右圖 x" #: hugin1/hugin/CPEditorPanel.cpp:144 msgid "right y" -msgstr "右 y" +msgstr "右圖 y" #: hugin1/hugin/CPEditorPanel.cpp:145 hugin1/hugin/CPListFrame.cpp:309 #: hugin1/hugin/CPListFrame.cpp:316 @@ -717,7 +707,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:685 hugin1/hugin/CPEditorPanel.cpp:809 msgid "Error during Fine-tune" -msgstr "調整中發生錯誤" +msgstr "最佳調整時發生錯誤" #: hugin1/hugin/CPEditorPanel.cpp:699 hugin1/hugin/CPEditorPanel.cpp:829 #: hugin1/hugin/CPEditorPanel.cpp:965 @@ -725,7 +715,7 @@ msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " -msgstr "調整後的點, 角度: %.0f 度, 相關係數: %0.3f, 曲率: %0.3f %0.3f " +msgstr "最佳調整後的點, 角度: %.0f 度, 相關係數: %0.3f, 曲率: %0.3f %0.3f " #: hugin1/hugin/CPEditorPanel.cpp:702 hugin1/hugin/CPEditorPanel.cpp:832 msgid "change points, or press right mouse button to add the pair" @@ -736,7 +726,6 @@ msgstr "測量影像外的點" #: hugin1/hugin/CPEditorPanel.cpp:972 -#, fuzzy msgid "No similar point found." msgstr "沒有發現相似點" @@ -754,13 +743,13 @@ msgstr "Hugin" #: hugin1/hugin/CPEditorPanel.cpp:979 -#, fuzzy, c-format +#, c-format msgid "" "Check the similarity visually.\n" "Correlation coefficient (%.3f) is lower than the threshold set in the " "preferences." msgstr "" -"請檢查目視相似度\n" +"請目視檢查相似度 \n" "相關係數 (%.3f) 低於偏好設定中設定的閥值." #: hugin1/hugin/CPEditorPanel.cpp:984 @@ -911,34 +900,33 @@ msgstr "選取控制點" #: hugin1/hugin/DragTool.cpp:78 -#, fuzzy msgid "" "Drag to move images (optionally use shift to constrain), or roll with right-" "drag or Ctrl-drag." msgstr "" -"拖曳圖片 (可以使用 shift 鍵來限制移動), 或使用右鍵-拖曳及 ctrl 鍵-拖曳來旋" -"轉。" +"直接拖曳來移動圖片 (可以用 shift 鍵來限制拖曳方向),或用 \"右鍵-拖曳\" 或 " +"\"ctrl +拖曳 \" 旋轉" #: hugin1/hugin/DragTool.cpp:106 msgid "" "Currently constrained to moving only pitch. Make a larger movement in the " "opposite direction to constrain to yaw." -msgstr "目前只允許縱向移動. 可以藉由往相反方向的大移動來限制成橫向移動" +msgstr "目前只允許俯仰移動. 可以藉由往相反方向的大移動來限制成轉向移動" #: hugin1/hugin/DragTool.cpp:110 msgid "" "Currently constrained to moving only yaw. Make a larger movement in the " "opposite direction to constrain to pitch." -msgstr "目前只允許橫向移動. 可以藉由往相反方向的大移動來限制成縱向移動" +msgstr "目前只允許轉向移動. 可以藉由往相反方向的大移動來限制成俯仰移動" #: hugin1/hugin/DragTool.cpp:211 msgid "Rotate around the centre to roll." -msgstr "以中心旋轉." +msgstr "以中心滾轉" #: hugin1/hugin/DragTool.cpp:232 msgid "" "Constrained drag: make a movement and it will be snapped to the yaw or pitch." -msgstr "限制拖曳: 拖曳時只會橫向或者縱向移動。" +msgstr "限制拖曳: 拖曳時只會轉向或者俯仰移動。" #: hugin1/hugin/DragTool.cpp:234 msgid "Drag to move." @@ -979,9 +967,8 @@ msgstr "自動裁剪" #: hugin1/hugin/GLPreviewFrame.cpp:362 translations/xrc.cpp:973 xrc.cpp:973 -#, fuzzy msgid "HDR Autocrop" -msgstr "自動裁剪" +msgstr "高動態範圍自動裁剪" #: hugin1/hugin/GLPreviewFrame.cpp:375 hugin1/hugin/GLPreviewFrame.cpp:3030 #: hugin1/hugin/MainFrame.cpp:364 hugin1/hugin/MainFrame.cpp:2093 @@ -1039,12 +1026,10 @@ msgstr "預覽" #: hugin1/hugin/GLPreviewFrame.cpp:574 -#, fuzzy msgid "Overview" -msgstr "預覽" +msgstr "總覽" #: hugin1/hugin/GLPreviewFrame.cpp:685 hugin1/hugin/PreviewFrame.cpp:304 -#, fuzzy msgid "Resets the projection's parameters to their default values." msgstr "將專案參數值重設為預設值" @@ -1053,19 +1038,18 @@ msgstr "參數:" #: hugin1/hugin/GLPreviewFrame.cpp:976 -#, fuzzy msgid "No images loaded." msgstr "沒有載入圖片" #: hugin1/hugin/GLPreviewFrame.cpp:1011 -#, fuzzy, c-format +#, c-format msgid "%lu images loaded." -msgstr "已載入 %d 圖片." +msgstr "已載入 %lu 圖片" #: hugin1/hugin/GLPreviewFrame.cpp:1027 -#, fuzzy, c-format +#, c-format msgid "Images are connected by %lu control points.\n" -msgstr "圖片藉由 %d 個控制點連接.\n" +msgstr "圖片由 %lu 個控制點互相連接\n" #: hugin1/hugin/GLPreviewFrame.cpp:1038 #, c-format @@ -1111,16 +1095,14 @@ msgstr " 最佳化後的平均錯誤: %.1f 像素, 最大值: %.1f\n" #: hugin1/hugin/GLPreviewFrame.cpp:1077 -#, fuzzy msgid "" "Note: automatic alignment uses default settings from the preferences. If you " "want to use customized settings, run the CP detection, the geometrical " "optimization and the photometric optimization from the Photos tab in the " "panorama editor." msgstr "" -"注意;自動對齊將使用偏好設定中的預設值.如果你想在進階的標籤中使用您自己的設定" -"的數值,可以在[圖片]標籤中執行CP偵測,在[最佳化]標籤中執行幾何最佳化,在[曝光]" -"標籤中執行光學性質最佳化." +"注意:自動對齊將使用偏好設定中的預設值。如果你想使用自訂數值,可以在[圖片]標" +"籤中執行CP偵測、標籤中執行幾何最佳化、及光學性質最佳化" #: hugin1/hugin/GLPreviewFrame.cpp:1486 hugin1/hugin/PreviewFrame.cpp:628 msgid "Rectilinear" @@ -1132,30 +1114,27 @@ #: hugin1/hugin/GLPreviewFrame.cpp:1585 hugin1/hugin/PreviewFrame.cpp:733 msgid "Yaw value must be numeric." |
From: <hug...@li...> - 2013-09-09 17:51:21
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/6a8a448574fc changeset: 6301:6a8a448574fc user: tmodes date: Thu May 30 18:03:56 2013 +0200 description: Removed PTBatcher (CLI version) All features are supported by PTBatcherGUI diffstat: src/hugin1/ptbatcher/Batch.cpp | 357 +++++++--------------------------- src/hugin1/ptbatcher/Batch.h | 5 +- src/hugin1/ptbatcher/BatchFrame.cpp | 3 +- src/hugin1/ptbatcher/CMakeLists.txt | 24 +- src/hugin1/ptbatcher/PTBatcher.cpp | 288 ---------------------------- src/hugin1/ptbatcher/PTBatcher.h | 44 ---- src/hugin1/ptbatcher/PTBatcher_rc.rc | 15 - 7 files changed, 80 insertions(+), 656 deletions(-) diffs (truncated from 1008 to 500 lines): diff -r 17656de5a14b -r 6a8a448574fc src/hugin1/ptbatcher/Batch.cpp --- a/src/hugin1/ptbatcher/Batch.cpp Thu May 30 18:01:44 2013 +0200 +++ b/src/hugin1/ptbatcher/Batch.cpp Thu May 30 18:03:56 2013 +0200 @@ -41,7 +41,7 @@ DEFINE_EVENT_TYPE(EVT_UPDATE_PARENT) #endif -Batch::Batch(wxFrame* parent, wxString path, bool bgui) : wxFrame(parent,wxID_ANY,_T("Batch")) +Batch::Batch(wxFrame* parent, wxString path) : wxFrame(parent,wxID_ANY,_T("Batch")) { //default flag settings parallel = false; @@ -52,7 +52,6 @@ autoremove = false; autostitch = false; saveLog = false; - gui = bgui; m_cancelled = false; m_paused = false; m_running = false; @@ -198,104 +197,27 @@ m_projList.Item(index).prefix = newPrefix; } -bool Batch::CheckProjectExistence() //used only in console version -{ -#ifdef __WXMSW__ //on windows we run a loop every second to check if running processes are still active - bool exist = true; - HANDLE process; - DWORD exitState; - while(exist) - { - exist = false; - - for(unsigned int i=0; i<m_stitchFrames.GetCount(); i++) - { - try - { - process = OpenProcess(PROCESS_QUERY_INFORMATION,true,m_stitchFrames.Item(i)->GetProcessId()); - GetExitCodeProcess(process,&exitState); - } - catch(::exception e) - { - exitState=1; - } - if(exitState==STILL_ACTIVE) - { - exist=true; - } - else if(exitState!=0) - { - SetStatus(GetIndex(m_stitchFrames.Item(i)->GetProjectId()),Project::FAILED); - } - CloseHandle(process); - } - wxSleep(1); - } -#else //not __WXMSW__, on Linux we wait for each of the processes to complete - int status; - int pid; - for(unsigned int i=0; i<m_stitchFrames.GetCount(); i++) - { - pid = m_stitchFrames.Item(i)->GetProcessId(); - if(waitpid(pid,&status,0)==-1) - { - SetStatus(GetIndex(m_stitchFrames.Item(i)->GetProjectId()),Project::FAILED); //we set to failed if waitpid terminated with an error - } - if(!WIFEXITED(status) || WEXITSTATUS(status)!=0) - { - SetStatus(GetIndex(m_stitchFrames.Item(i)->GetProjectId()),Project::FAILED); //we set to failed if child terminated abnormally or with a bad exit code - } - } -#endif - - wxProcessEvent event; - for(int i=m_stitchFrames.GetCount()-1; i>=0; i--) - { - event.SetId(m_stitchFrames.Item(i)->GetProjectId()); - if(GetStatus(GetIndex(m_stitchFrames.Item(i)->GetProjectId()))==Project::FAILED) - { - event.SetTimestamp(-1); //a failed exit code cannot be set to a wxWidgets event, so we fake it inside event's timestamp - } - OnProcessTerminate(event); - } - return true; -} - int Batch::ClearBatch() { if(m_stitchFrames.GetCount()!=0) { - if(gui) + wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif + wxYES | wxCANCEL | wxICON_INFORMATION); + if(message.ShowModal()==wxID_YES) { - wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), -#ifdef _WINDOWS - _("PTBatcherGUI"), -#else - wxT(""), -#endif - wxYES | wxCANCEL | wxICON_INFORMATION); - if(message.ShowModal()==wxID_YES) - { - CancelBatch(); + CancelBatch(); - //we set a flag so we don't process terminating events - m_clearedInProgress = true; - Project::idGenerator=1; - m_projList.Clear(); - if(gui) - { - ((wxFrame*)GetParent())->SetStatusText(_("Cleared batch.")); - } - else if(verbose) - { - cout << "Cleared batch." << endl; - } - return 2; - } - } - else if(verbose) - { - cout << "Error: Cannot clear batch in progress." << endl; + //we set a flag so we don't process terminating events + m_clearedInProgress = true; + Project::idGenerator=1; + m_projList.Clear(); + ((wxFrame*)GetParent())->SetStatusText(_("Cleared batch.")); + return 2; } return 1; //TO-DO: return @@ -304,14 +226,7 @@ { Project::idGenerator=1; m_projList.Clear(); - if(gui) - { - ((wxFrame*)GetParent())->SetStatusText(_("Cleared batch.")); - } - else if(verbose) - { - cout << "Cleared batch." << endl; - } + ((wxFrame*)GetParent())->SetStatusText(_("Cleared batch.")); return 0; } } @@ -392,14 +307,10 @@ { return m_projList.Item(index).status; } - else if(gui) + else { wxMessageBox(wxString::Format(_("Error: Could not get status, project with index %d is not in list."),index),_("Error!"),wxOK | wxICON_INFORMATION ); } - else if(verbose) - { - cout << "Error: Could not get status, project with index " << index << " is not in list." << endl; - } return Project::MISSING; } @@ -445,14 +356,10 @@ AppendBatchFile(file); return 2; } - else if(gui) + else { wxMessageBox(_("Error: Could not load batch file.")); - } - else if(verbose) - { - cout << "Error: Could not load batch file." << endl; - } + }; return 1; } @@ -491,10 +398,6 @@ } //we load the data from the temp file AppendBatchFile(workingDir->GetName()+wxFileName::GetPathSeparator()+temp); - if(verbose && !gui) - { - cout << "Loaded temp file." << endl; - } return 0; } @@ -573,7 +476,7 @@ { m_projList.Item(i).status=Project::FINISHED; // don't sent event for command app - if(gui && m_projList.Item(i).id>=0) + if(m_projList.Item(i).id>=0) { bool notifyParent=false; if(autostitch && m_projList.Item(i).target==Project::DETECTING) @@ -603,84 +506,44 @@ m_running = false; if(NoErrors()) { - if(gui) - { - wxCommandEvent e(EVT_INFORMATION,wxID_ANY); - e.SetString(_("Batch successfully completed.")); - GetParent()->GetEventHandler()->AddPendingEvent(e); - } - else - //cout << "Project \"" << m_projList.Item(i).path.char_str() << "\" finished. Batch successfully completed." << endl; - { - cout << "Batch successfully completed." << endl; - } + wxCommandEvent e(EVT_INFORMATION,wxID_ANY); + e.SetString(_("Batch successfully completed.")); + GetParent()->GetEventHandler()->AddPendingEvent(e); } else { - if(gui) + SetStatusText(_("Batch completed with errors.")); + if(!shutdown) { - SetStatusText(_("Batch completed with errors.")); - if(!shutdown) - { - if(gui) - { - //notify parent, that at least one project failed - wxCommandEvent e(EVT_BATCH_FAILED,wxID_ANY); - GetParent()->GetEventHandler()->AddPendingEvent(e); - }; - }; - } - else - //cout << "Project \"" << m_projList.Item(i).path.char_str() << "\" finished. Batch completed with errors." << endl; - { - cout << "Batch completed with errors." << endl; - } + //notify parent, that at least one project failed + wxCommandEvent e(EVT_BATCH_FAILED,wxID_ANY); + GetParent()->GetEventHandler()->AddPendingEvent(e); + }; } if(shutdown) //after we are finished we turn off the computer if checked { - if(gui) + wxProgressDialog progress(_("Initializing shutdown..."), _("Shutting down..."),49,this, + wxPD_AUTO_HIDE | wxPD_SMOOTH | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_CAN_SKIP); + progress.Fit(); + int i = 0; + bool skip = false; + while(progress.Update(i, _("Shutting down..."),&skip)) { - wxProgressDialog progress(_("Initializing shutdown..."), _("Shutting down..."),49,this, - wxPD_AUTO_HIDE | wxPD_SMOOTH | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_CAN_SKIP); - progress.Fit(); - int i = 0; - bool skip = false; - while(progress.Update(i, _("Shutting down..."),&skip)) + if(skip || i==50) { - if(skip || i==50) - { - /*wxMessageDialog message(this,_T("Krneksa")); - message.ShowModal(); - break;*/ - wxShutdown(wxSHUTDOWN_POWEROFF); - } - i++; + /*wxMessageDialog message(this,_T("Krneksa")); + message.ShowModal(); + break;*/ + wxShutdown(wxSHUTDOWN_POWEROFF); + } + i++; #if defined __WXMSW__ - Sleep(200); + Sleep(200); #else - sleep(200); + sleep(200); #endif - } - progress.Close(); } - else - { - if(!wxShutdown(wxSHUTDOWN_POWEROFF)) - { - if(gui) -#ifdef __WXMSW__ - wxMessageBox(_("Error shutting down.")); -#else - wxMessageBox(_("Error shutting down. Do you have root privileges?")); -#endif - else -#ifdef __WXMSW__ - cout << "Error shutting down." << endl; -#else - cout << "Error shutting down. Do you have root privileges?" << endl; -#endif - } - } + progress.Close(); } } else @@ -755,11 +618,6 @@ } } - if(!gui) - { - cout << "Stitching with input file " << (const char*)scriptFile.mb_str(wxConvLocal) << "..." << endl; - } - // check output filename wxFileName outfn(outname); wxString ext = outfn.GetExt(); @@ -775,7 +633,7 @@ RunStitchFrame* stitchFrame = new RunStitchFrame(this, wxT("Hugin Stitcher"), wxDefaultPosition, wxSize(640,600)); stitchFrame->SetProjectId(id); - if(verbose && gui) + if(verbose) { stitchFrame->Show( true ); wxTheApp->SetTopWindow( stitchFrame ); @@ -803,14 +661,9 @@ bool Batch::OnDetect(wxString scriptFile, int id) { - if(!gui) - { - cout << "Running assistant with input file " << (const char*)scriptFile.mb_str(wxConvLocal) << "..." << endl; - } - RunStitchFrame* stitchFrame = new RunStitchFrame(this, wxT("Hugin Assistant"), wxDefaultPosition, wxSize(640,600)); stitchFrame->SetProjectId(id); - if(verbose && gui) + if(verbose) { stitchFrame->Show( true ); wxTheApp->SetTopWindow( stitchFrame ); @@ -873,14 +726,10 @@ { RemoveProjectAtIndex(GetIndex(id)); } - else if(gui) + else { wxMessageBox(wxString::Format(_("Error removing, project with id %d is not in list."),id),_("Error!"),wxOK | wxICON_INFORMATION ); } - else if(verbose) - { - cout << "Error: Project with id " << id << " is not in list." << endl; - } } void Batch::RemoveProjectAtIndex(int selIndex) @@ -895,14 +744,7 @@ { if(!wxRemoveFile(file.GetFullPath())) { - if(gui) - { - wxMessageBox( _("Error: Could not delete project file ")+file.GetFullPath(),_("Error!"),wxOK | wxICON_INFORMATION ); - } - else if(verbose) - { - cout << "Error: Could not delete project file " << (const char*)file.GetFullPath().char_str() << endl; - } + wxMessageBox( _("Error: Could not delete project file ")+file.GetFullPath(),_("Error!"),wxOK | wxICON_INFORMATION ); } } } @@ -915,25 +757,14 @@ void Batch::RunBatch() { - if(!gui && m_projList.GetCount() == 0) - { - cout << "Batch is empty." << endl; - } - else if(!m_running) + if(!m_running) { m_failedProjects.clear(); - if(gui) - { - ((wxFrame*)GetParent())->SetStatusText(_("Running batch...")); - } - else - { - cout << "Running batch..." << endl; - } + ((wxFrame*)GetParent())->SetStatusText(_("Running batch...")); m_running = true; RunNextInBatch(); } - else if(gui) + else { ((wxFrame*)GetParent())->SetStatusText(_("Batch already in progress.")); } @@ -949,36 +780,16 @@ //execute command line instructions if(m_projList.Item(i).id<0) { - if(gui) + SetStatusText(_("Running command \"")+m_projList.Item(i).path+_T("\"")); + m_projList.Item(i).status=Project::RUNNING; + //we create a fake stitchFrame, so program waits for app to complete + if(wxExecute(m_projList.Item(i).path, wxEXEC_SYNC)==0) { - SetStatusText(_("Running command \"")+m_projList.Item(i).path+_T("\"")); + m_projList.Item(i).status=Project::FINISHED; } else { - cout << "Running command \"" << (const char*)m_projList.Item(i).path.char_str() << "\"" << endl; - } - m_projList.Item(i).status=Project::RUNNING; - //we create a fake stitchFrame, so program waits for app to complete - if(!gui) - { - RunStitchFrame* stitchFrame = new RunStitchFrame(this, wxT("Hugin Stitcher"), wxDefaultPosition, wxSize(640,600)); - stitchFrame->SetProjectId(m_projList.Item(i).id); - - repeat = false; - int pid = wxExecute(m_projList.Item(i).path, wxEXEC_ASYNC); - stitchFrame->SetProcessId(pid); - m_stitchFrames.Add(stitchFrame); - } - else - { - if(wxExecute(m_projList.Item(i).path, wxEXEC_SYNC)==0) - { - m_projList.Item(i).status=Project::FINISHED; - } - else - { - m_projList.Item(i).status=Project::FAILED; - } + m_projList.Item(i).status=Project::FAILED; } } else @@ -990,22 +801,16 @@ m_running = true; if(m_projList.Item(i).target==Project::STITCHING) { - if(gui) - { - wxCommandEvent e(EVT_INFORMATION,wxID_ANY); - e.SetString(wxString::Format(_("Now stitching: %s"),m_projList.Item(i).path.c_str())); - GetParent()->GetEventHandler()->AddPendingEvent(e); - }; + wxCommandEvent e(EVT_INFORMATION,wxID_ANY); + e.SetString(wxString::Format(_("Now stitching: %s"),m_projList.Item(i).path.c_str())); + GetParent()->GetEventHandler()->AddPendingEvent(e); value = OnStitch(m_projList.Item(i).path, m_projList.Item(i).prefix, m_projList.Item(i).id); } else { - if(gui) - { - wxCommandEvent e(EVT_INFORMATION,wxID_ANY); - e.SetString(wxString::Format(_("Now detecting: %s"),m_projList.Item(i).path.c_str())); - GetParent()->GetEventHandler()->AddPendingEvent(e); - }; + wxCommandEvent e(EVT_INFORMATION,wxID_ANY); + e.SetString(wxString::Format(_("Now detecting: %s"),m_projList.Item(i).path.c_str())); + GetParent()->GetEventHandler()->AddPendingEvent(e); value = OnDetect(m_projList.Item(i).path,m_projList.Item(i).id); }; if(!value) @@ -1029,22 +834,16 @@ m_running = true; if(m_projList.Item(i).target==Project::STITCHING) { - if(gui) - { - wxCommandEvent e(EVT_INFORMATION,wxID_ANY); - e.SetString(wxString::Format(_("Now stitching: %s"),m_projList.Item(i).path.c_str())); - GetParent()->GetEventHandler()->AddPendingEvent(e); - }; + wxCommandEvent e(EVT_INFORMATION,wxID_ANY); |
From: <hug...@li...> - 2013-09-09 17:51:20
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/533c8a7fcb7a changeset: 6297:533c8a7fcb7a user: tmodes date: Thu May 30 17:57:29 2013 +0200 description: Removed duplicate code diffstat: src/hugin_cpfind/cpfind/PanoDetector.cpp | 3 ++- src/hugin_cpfind/cpfind/Utils.cpp | 26 -------------------------- src/hugin_cpfind/cpfind/Utils.h | 3 --- 3 files changed, 2 insertions(+), 30 deletions(-) diffs (69 lines): diff -r 8ec9aeda2daa -r 533c8a7fcb7a src/hugin_cpfind/cpfind/PanoDetector.cpp --- a/src/hugin_cpfind/cpfind/PanoDetector.cpp Tue May 28 19:22:53 2013 +0200 +++ b/src/hugin_cpfind/cpfind/PanoDetector.cpp Thu May 30 17:57:29 2013 +0200 @@ -31,6 +31,7 @@ #include "zthread/PoolExecutor.h" #include "Utils.h" #include "Tracer.h" +#include "hugin_base/hugin_utils/platform.h" #include <algorithms/nona/ComputeImageROI.h> #include <nona/RemappedPanoImage.h> @@ -112,7 +113,7 @@ _writeAllKeyPoints(false), _verbose(1), _sieve1Width(10), _sieve1Height(10), _sieve1Size(100), _kdTreeSearchSteps(200), _kdTreeSecondDistance(0.25), _ransacIters(1000), _ransacDistanceThres(50), - _sieve2Width(5), _sieve2Height(5),_sieve2Size(1), _test(false), _cores(utils::getCPUCount()), + _sieve2Width(5), _sieve2Height(5),_sieve2Size(1), _test(false), _cores(hugin_utils::getCPUCount()), _minimumMatches(6), _linearMatchLen(1), _downscale(true), _cache(false), _cleanup(false), _keypath(""), _outputFile("default.pto"), _outputGiven(false), _celeste(false), _celesteThreshold(0.5), _celesteRadius(20), _matchingStrategy(ALLPAIRS) diff -r 8ec9aeda2daa -r 533c8a7fcb7a src/hugin_cpfind/cpfind/Utils.cpp --- a/src/hugin_cpfind/cpfind/Utils.cpp Tue May 28 19:22:53 2013 +0200 +++ b/src/hugin_cpfind/cpfind/Utils.cpp Thu May 30 17:57:29 2013 +0200 @@ -30,32 +30,6 @@ #include <unistd.h> #endif -int utils::getCPUCount() -{ -#ifdef WIN32 - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwNumberOfProcessors; -#elif defined(HW_NCPU) || defined(__APPLE__) - // BSD and OSX like system - int mib[2]; - int numCPUs = 1; - size_t len = sizeof(numCPUs); - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - sysctl(mib, 2, &numCPUs, &len, 0, 0); - return numCPUs; - -#elif defined(_SC_NPROCESSORS_ONLN) - // Linux and Solaris - long nProcessorsOnline = sysconf(_SC_NPROCESSORS_ONLN); - return nProcessorsOnline; -#else - return 1; -#endif -} - #ifdef _WINDOWS unsigned long long utils::getTotalMemory() { diff -r 8ec9aeda2daa -r 533c8a7fcb7a src/hugin_cpfind/cpfind/Utils.h --- a/src/hugin_cpfind/cpfind/Utils.h Tue May 28 19:22:53 2013 +0200 +++ b/src/hugin_cpfind/cpfind/Utils.h Thu May 30 17:57:29 2013 +0200 @@ -42,9 +42,6 @@ namespace utils { -int getCPUCount(); - - //extern "C" { #ifdef WIN32 |
From: <hug...@li...> - 2013-09-09 17:51:20
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/aae44c4b0570 changeset: 6302:aae44c4b0570 user: Lukas Jirkovsky <l.j...@gm...> date: Sun Jun 09 12:29:12 2013 +0200 description: Specify the encoding of deghosting_mask.pod file as utf8, because otherwise it breaks the build with recent perl. diffstat: doc/deghosting_mask.pod | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (9 lines): diff -r 6a8a448574fc -r aae44c4b0570 doc/deghosting_mask.pod --- a/doc/deghosting_mask.pod Thu May 30 18:03:56 2013 +0200 +++ b/doc/deghosting_mask.pod Sun Jun 09 12:29:12 2013 +0200 @@ -1,3 +1,5 @@ +=encoding utf8 + =head1 NAME deghosting_mask - Creates mask for removing ghosting in images |
From: <hug...@li...> - 2013-09-09 17:51:20
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/17656de5a14b changeset: 6300:17656de5a14b user: tmodes date: Thu May 30 18:01:44 2013 +0200 description: Removed unused scripts autopano-noop.sh and matchpoint-complete diffstat: CMakeLists.txt | 1 - utils/CMakeLists.txt | 3 - utils/autopano-noop.sh | 41 ---------------------- utils/matchpoint-complete | 86 ----------------------------------------------- 4 files changed, 0 insertions(+), 131 deletions(-) diffs (153 lines): diff -r ffc8e011d6aa -r 17656de5a14b CMakeLists.txt --- a/CMakeLists.txt Thu May 30 18:00:59 2013 +0200 +++ b/CMakeLists.txt Thu May 30 18:01:44 2013 +0200 @@ -563,7 +563,6 @@ add_subdirectory(src) add_subdirectory(doc) -add_subdirectory(utils) # install enfuse droplets and windows installer and everything else in platforms ADD_SUBDIRECTORY(platforms) diff -r ffc8e011d6aa -r 17656de5a14b utils/CMakeLists.txt --- a/utils/CMakeLists.txt Thu May 30 18:00:59 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -IF(UNIX) - install(PROGRAMS autopano-noop.sh DESTINATION ${BINDIR}) -ENDIF(UNIX) diff -r ffc8e011d6aa -r 17656de5a14b utils/autopano-noop.sh --- a/utils/autopano-noop.sh Thu May 30 18:00:59 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -#!/bin/sh - -# Tivial wrapper script for autopano-sift-c - -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this software; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -if which 'autopano-sift-c' 2>/dev/null >/dev/null -then - 'autopano-sift-c' "$@" -else - -echo " - READ THIS -- READ THIS -- READ THIS -- READ THIS -- READ THIS -- READ THIS - - If you see this message then you have upgraded from an earlier - version of Hugin and have no Control Point Detector configured. - - Please open the Preferences window and Load Defaults for the - Control Point Detectors setting. - - This will enable the new built-in Control Point Detector and - you won't see this message again. -" - -sleep 120 - -fi - -exit 0 diff -r ffc8e011d6aa -r 17656de5a14b utils/matchpoint-complete --- a/utils/matchpoint-complete Thu May 30 18:00:59 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use File::Spec::Functions; -use Getopt::Long; -use Pod::Usage; - -my $path_output; -my $points = 10; -my $noransac = 0; -my $clean = 0; -my $help = 0; - -GetOptions ('o|output=s' => \$path_output, - 'p|points=i' => \$points, - 'n|noransac' => \$noransac, - 'c|clean' => \$clean, - 'h|help' => \$help); - -my @paths_input = @ARGV; - -my $ransac = 1; $ransac = 0 if $noransac; - -pod2usage (-verbose => 2) if $help; -pod2usage (2) unless (defined $path_output and scalar @paths_input > 1); - -my @paths_key; - -for my $path_input (@paths_input) -{ - my $path_key = "$path_input.key"; - push @paths_key, $path_key; - next if (-e $path_key and not $clean); - system ('matchpoint', $path_input, $path_key); -} - -system ('autopano', '--ransac', $ransac, - '--maxmatches', $points, $path_output, @paths_key); - -for my $path_key (@paths_key) -{ - unlink $path_key if ($clean); -} - -exit 0; - -__END__ - -=head1 NAME - -matchpoint-complete - wrapper for matchpoint and autopano - -=head1 SYNOPSIS - -matchpoint-complete [options] --output project.pto image1 image2 [...] - - Options: - -o | --output name Filename of created panorama project - -p | --points number Number of generated control points between, - each pair, default: 10 - -n | --noransac No ransac detection, useful for fisheye images - -c | --clean Do not reuse keypoints detected in earlier runs, - deletes old keypoint files. - -h | --help Outputs help documentation. - -=head1 DESCRIPTION - -B<matchpoint-complete> takes a list of image files and creates a hugin -compatible project file containing control points linking the images together. - -=head1 LICENSE - -This file is licensed under the same terms as matchpoint itself - -=head1 SEE ALSO - -L<http://hugin.sourceforge.net/> -L<http://cs.tu-berlin.de/~nowozin/autopano-sift/> - -=head1 AUTHOR - -Bruno Postle - April 2008. Based on autopano-c-complete by Pablo d'Angelo - -=cut - |
From: <hug...@li...> - 2013-09-09 17:51:20
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/175a37833068 changeset: 6298:175a37833068 user: tmodes date: Thu May 30 18:00:17 2013 +0200 description: Removed matchpoint Supersedes by cpfind diffstat: src/CMakeLists.txt | 1 - src/matchpoint/APImage.cpp | 423 ------ src/matchpoint/APImage.h | 121 - src/matchpoint/CMakeLists.txt | 12 - src/matchpoint/COPYING | 339 ----- src/matchpoint/Descriptor.cpp | 839 ------------- src/matchpoint/Descriptor.h | 65 - src/matchpoint/HessianDetector.cpp | 695 ----------- src/matchpoint/HessianDetector.h | 86 - src/matchpoint/MatchPoint.cpp | 162 -- src/matchpoint/Praprot.jpg | 0 src/matchpoint/README | 1 - src/matchpoint/edgedetection.hxx | 2181 ----------------------------------- src/matchpoint/java/gauss/Main.java | 72 - src/matchpoint/main.cpp | 175 -- src/matchpoint/test/README | 3 - src/matchpoint/test/main.cpp | 191 --- 17 files changed, 0 insertions(+), 5366 deletions(-) diffs (truncated from 5438 to 500 lines): diff -r 533c8a7fcb7a -r 175a37833068 src/CMakeLists.txt --- a/src/CMakeLists.txt Thu May 30 17:57:29 2013 +0200 +++ b/src/CMakeLists.txt Thu May 30 18:00:17 2013 +0200 @@ -30,7 +30,6 @@ add_subdirectory(foreign) add_subdirectory(hugin_base) add_subdirectory(tools) -add_subdirectory(matchpoint) add_subdirectory(deghosting) # build vips stuff, only if vips was found diff -r 533c8a7fcb7a -r 175a37833068 src/matchpoint/APImage.cpp --- a/src/matchpoint/APImage.cpp Thu May 30 17:57:29 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,423 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Zoran Mesec * - * zor...@gm... * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#include <string> -#include <math.h> -#include "APImage.h" - -#ifdef USE_VIGRA - using namespace vigra; -#endif - -APImage::APImage(string p) { -this->path=p; -} - -bool APImage::open() { - -#ifdef USE_VIGRA - try - { - // read image given as first argument - // file type is determined automatically - ImageImportInfo info(this->path.c_str()); - //cout << this->path.c_str() << "Size:"<< info.width() <<"\n"; - - if(info.isGrayscale()) - { - // create a gray scale image of appropriate size - vigra::BImage in(info.width(), info.height()); - this->imgBW=new BImage(info.width(), info.height()); - // import the image just read - importImage(info, destImage(*this->imgBW)); - } - else - { - - BRGBImage in(info.width(), info.height()); - - //TODO: this does not work. How to make a conversion from RGB to BW image in vigra??? - this->imgBW=new BImage(info.width(), info.height()); - - importImage(info, destImage(in)); - - // create image iterator that points to upper left corner - // of source image - vigra::BRGBImage::Iterator sy = in.upperLeft(); - - // create image iterator that points past the lower right corner of - // source image (similarly to the past-the-end iterator in the STL) - vigra::BRGBImage::Iterator send = in.lowerRight(); - - // create image iterator that points to upper left corner - // of destination image - vigra::BImage::Iterator dy = (*this->imgBW).upperLeft(); - - // iterate down the first column of the images - for(; sy.y != send.y; ++sy.y, ++dy.y) - { - // create image iterator that points to the first - // pixel of the current row of the source image - vigra::BRGBImage::Iterator sx = sy; - - // create image iterator that points to the first - // pixel of the current row of the destination image - vigra::BImage::Iterator dx = dy; - - // iterate across current row - for(; sx.x != send.x; ++sx.x, ++dx.x) - { - RGBValue<int,0u,1u,2u> pixel = *sx; - // calculate grayscale value - // Y = 0.3*R + 0.59*G + 0.11*B - *dx = vigra::round(0.3*pixel.red() + 0.59*pixel.green() + 0.11*pixel.blue()); - } - } - //exportAPImage(srcAPImageRange(*this->imgBW), vigra::APImageExportInfo("ttt.jpg")); - } - return true; - } - catch (...) - { - // catch any errors that might have occured and print their reason - return false; - } -#endif -} -void APImage::convolute(int* kernel,int dim1, int dim2,double scale) { - /*CvScalar s; - int offsetX=floor(dim1/2); - int offsetY=floor(dim2/2); - int xStart=0; - int yStart=0; - - double pixelSum=0; - // bool outOfRange=false; - int tmpX=0; - int tmpY=0; - double max=0; - - for(int i=0;i<imgBW->height;i++) { - for(int j=0; j<imgBW->width;j++) { - //s=cvGet2D(imgBW,i,j); - outOfRange=true; - if(j-offsetX<0) { - outOfRange=true; - } - if(i-offsetX<0) - - pixelSum=0; - xStart=i-offsetX; - yStart=j-offsetY; - for(int k=0;k<dim1;k++) { - tmpX=xStart+k; - for(int l=0;l<dim2;l++) { - tmpY=yStart+l; - if((tmpX)<0 ||tmpY<0 || tmpX>=imgBW->height || tmpY>=imgBW->width) { - pixelSum+=kernel[k*dim2+l]*(rand()%256); - } else { - - s=cvGet2D(imgBW,xStart+k,yStart+l); - //cout << " "<< s.val[0] << "\n"; - - pixelSum+=kernel[k*dim2+l]*s.val[0]; - } - //cout << "\nPixelSum:"<< pixelSum; - } - } - s.val[0]=pixelSum*0.004; - cvSet2D(imgBW,i,j,s); // set the (i,j) pixel value - if(pixelSum>max) max=pixelSum; - //cout << " "<< pixelSum; - //this->convolution[i][j]=pixelSum; - //s=cvGet2D(imgBW,i,j); -// s.val[0]=rand()%255; -// cvSet2D(imgBW,i,j,s); // set the (i,j) pixel value - } - //out << "\n"; - }*/ -} -int APImage::getPixel(int x,int y) { -#ifdef USE_VIGRA - return (*this->imgBW)(x,y); -#endif -#ifdef USE_OPENCV - CvScalar s=cvGet2D(imgBW,x,y); - s.val[0]; -#endif -} -int APImage::getWidth() { - return this->imgBW->width(); -} -int APImage::getWidthBW() { - return this->imgBW->width(); -} -int APImage::getHeight() { - return this->imgBW->height(); -} -int APImage::getHeightBW() { - return this->imgBW->height(); -} -APImage* APImage::getCopy() { - return new APImage(""); -} -void APImage::scale(double factor) { -//#ifdef USE_OPENCV - /*IplAPImage *resized= cvCreateAPImage(cvSize(round(this->getWidthBW()/factor),round(this->getHeightBW()/factor)), imgBW->depth ,imgBW->nChannels); - cvResize(imgBW,resized); - this->imgBW=resized;*/ -//#endif -} -void APImage::show() { -#ifdef USE_VIGRA - string add = "00det_"; - add.append(this->getPath()); - - cout << "Results:"<< add << endl; - exportImage(srcImageRange(*this->imgBW), ImageExportInfo(add.c_str())); -#endif -#ifdef USE_OPENCV - cvNamedWindow( "Image view", 1 ); - cvShowAPImage( "Image view", this->img); - cvWaitKey(0); // very important, contains event processing loop inside - cvDestroyWindow( "Image view" ); -#endif - //cvReleaseAPImage( &img ); -} -void APImage::drawCircle(int x,int y, int radius) { - //cout << "Circle:" << x << "," << y << ",radius:"<<radius<<"\n"; -#ifdef USE_VIGRA - - (*this->imgBW)(x,y) = 255; - (*this->imgBW)(x+1,y+1) = 255; - (*this->imgBW)(x-1,y-1) = 255; - (*this->imgBW)(x-1,y+1) = 255; - (*this->imgBW)(x+1,y-1) = 255; - -#endif - //cout << "EOF CIRCLE DRAWING" <<endl; - -#ifdef USE_OPENCV - cvCircle(this->img, cvPoint(x,y), radius, cvScalar(0,255,0), 1); - cvCircle(this->img, cvPoint(x,y), 0, cvScalar(0,255,0), 1); -#endif - -} -void APImage::drawRectangle(int x,int y, int radius) { - //cvRectangle(this->img,cvPoint(x-radius,y-radius),cvPoint(x+radius,y+radius),cvScalar(0,255,0)); -} - -void APImage::drawLine(int x1,int y1, int x2,int y2) { - //cout << "Draw line:("<< x1<< ","<<y1<<")->("<<x2<<","<<y2<<")\n"; -#ifdef USE_OPENCV - cvLine(this->img,cvPoint(x1,y1),cvPoint(x2,y2),cvScalar(0,255,255)); -#endif - -} - -void APImage::smooth() { - //TODO: create a gaussian mask and call the function convolute -} -/** - * Calculates the integral image - */ -void APImage::integrate() { - - /*cout << "Height:"<< this->getHeightBW() <<"\n"; - cout << "Width:"<< this->getWidthBW() <<"\n";*/ - - /*for(int i=0;i<10;i++) { - for(int j=0; j<10;j++) { - cout << this->getPixel(j,i)<<" "; - } - cout << "\n"; - }*/ - - this->integral.clear(); - this->integral.resize(this->getWidthBW()); - for(int i=0;i<this->getWidthBW();i++) { - this->integral[i].resize(this->getHeightBW()); - for(int j=0; j<this->getHeightBW();j++) { - //cout << i << ","<< j<<"\n"; - this->integral[i][j]=this->_getValue4Integral(i,j-1)+this->_getValue4Integral(i-1,j)+this->getPixel(i,j)-this->_getValue4Integral(i-1,j-1); - } - //cout << "\n"; - } - - /*for(int i=0;i<10;i++) { - for(int j=0; j<10;j++) { - cout << this->getIntegralPixel(j,i)<<" "; - } - cout << "\n"; - } - - cout << this->getRegionSum(2,1,2,3) <<"dddddd\n";*/ -} -int APImage::_getValue4Integral(int x, int y) { -if(x==-1 || y==-1) return 0; -else return this->integral[x][y]; -} -int APImage::getIntegralPixel(int x,int y) { - return this->integral[x][y]; -} -int APImage::getRegionSum(int y1, int x1, int y2, int x2) { - if(x1<=0) x1=1; - if(y1<=0) y1=1; - if(x2<=0) x2=1; - if(y2<=0) y2=1; - if(x1>=this->getWidthBW()) x1=this->getWidthBW()-1; - if(x2>=this->getWidthBW()) x2=this->getWidthBW()-1; - if(y1>=this->getHeightBW()) y1=this->getHeightBW()-1; - if(y2>=this->getHeightBW()) y2=this->getHeightBW()-1; - return this->integral[x2][y2]+this->integral[x1-1][y1-1]-this->integral[x1-1][y2]-this->integral[x2][y1-1]; -} -string APImage::getPath() { - return this->path; -} - -/*double APImage::getPointOrientation(int x, int y) { - - return 0.0; -}*/ - -template <class SrcIterator, class SrcAccessor, class BackInsertable> -void APImage::_cannyEdgelList1(triple<SrcIterator, SrcIterator, SrcAccessor> src, - BackInsertable & edgels, double scale,vector<int>* point ) -{ - _cannyEdgelList(src.first, src.second, src.third, edgels, scale, point); -} - -template <class SrcIterator, class SrcAccessor, class BackInsertable> -void APImage::_cannyEdgelList(SrcIterator ul, SrcIterator lr, SrcAccessor src, - BackInsertable & edgels, double scale, vector<int>* point) -{ - int w = lr.x - ul.x; - int h = lr.y - ul.y; - - // calculate image gradients - typedef typename - NumericTraits<typename SrcAccessor::value_type>::RealPromote - TmpType; - - BasicImage<TmpType> tmp(w,h), dx(w,h), dy(w,h); - - Kernel1D<double> smooth, grad; - - smooth.initGaussian(scale); - grad.initGaussianDerivative(scale, 1); - - separableConvolveX(srcIterRange(ul, lr, src), destImage(tmp), kernel1d(grad)); - separableConvolveY(srcImageRange(tmp), destImage(dx), kernel1d(smooth)); - - separableConvolveY(srcIterRange(ul, lr, src), destImage(tmp), kernel1d(grad)); - separableConvolveX(srcImageRange(tmp), destImage(dy), kernel1d(smooth)); - - combineTwoImages(srcImageRange(dx), srcImage(dy), destImage(tmp), - MagnitudeFunctor<TmpType>()); - - - // find edgels - internalCannyFindEdgels(dx, dy, tmp, edgels, point); -} - -template <class Image1, class Image2, class BackInsertable> -void APImage::_internalCannyFindEdgels(Image1 const & gx, - Image1 const & gy, - Image2 const & magnitude, - BackInsertable & edgels, vector<int>* p) -{ - typedef typename Image1::value_type PixelType; - double t = 0.5 / VIGRA_CSTD::sin(M_PI/8.0); - - //last element in edgel list is edgel that holds orientation - //of interest point - - //orientation assignment - vector<int > point= *p; - PixelType gradx = gx(p[0],p[1]); - PixelType grady = gy(p[0],p[1]); - - double orientation = VIGRA_CSTD::atan2(-grady, gradx) - M_PI * 1.5; - if(orientation < 0.0) - orientation += 2.0*M_PI; - Edgel edgel; - edgel.orientation=orientation; - edgels.push_back(edgel); - //EOF orientation assignment - - for(int y=1; y<gx.height()-1; ++y) - { - for(int x=1; x<gx.width()-1; ++x) - { - gradx = gx(x,y); - grady = gy(x,y); - double mag = magnitude(x, y); - - int dx = (int)VIGRA_CSTD::floor(gradx*t/mag + 0.5); - int dy = (int)VIGRA_CSTD::floor(grady*t/mag + 0.5); - - int x1 = x - dx, - x2 = x + dx, - y1 = y - dy, - y2 = y + dy; - - PixelType m1 = magnitude(x1, y1); - PixelType m3 = magnitude(x2, y2); - - if(m1 < mag && m3 <= mag) - { - Edgel edgel; - - // local maximum => quadratic interpolation of sub-pixel location - PixelType del = (m1 - m3) / 2.0 / (m1 + m3 - 2.0*mag); - edgel.x = x + dx*del; - edgel.y = y + dy*del; - edgel.strength = mag; - orientation = VIGRA_CSTD::atan2(-grady, gradx) - M_PI * 1.5; - if(orientation < 0.0) - orientation += 2.0*M_PI; - edgel.orientation = orientation; - edgels.push_back(edgel); - } - } - } -} - -void APImage::test() { - // empty edgel list - /*std::vector<vigra::Edgel> edgels; - - // find edgels at scale of the interest point - vigra::cannyEdgelList(srcIterRange( this->imgBW->upperLeft() + vigra::Diff2D(250, 250), - this->imgBW->upperLeft() + vigra::Diff2D(550, 450)), - edgels, 1.2, ); - cout << "Size:" << edgels.size() << endl; - vector<vigra::Edgel>::iterator iter2 = edgels.begin(); - int a=0; - while( iter2 != edgels.end()) { //loop over every canny pixel - vigra::Edgel edgePoint=*iter2; - //cout << edgePoint.strength << endl; - if(edgePoint.strength>5) { - this->drawCircle(round(edgePoint.x)+250,round(edgePoint.y)+250,0); - a++; - } - iter2++; - } - cout << a << endl;*/ -} diff -r 533c8a7fcb7a -r 175a37833068 src/matchpoint/APImage.h --- a/src/matchpoint/APImage.h Thu May 30 17:57:29 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,121 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Zoran Mesec * - * zor...@gm... * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef IMAGE_H_INCLUDED -#define IMAGE_H_INCLUDED -#define USE_VIGRA - -#include <string> -#include <stdio.h> -#include <iostream> -#include <stdlib.h> -#include <vector> - -#ifdef USE_OPENCV -#include "cv.h" -#endif - -#ifdef USE_VIGRA -#include "vigra/stdimage.hxx" -#include "vigra/imageinfo.hxx" -#include "vigra/impex.hxx" -#include "vigra/stdimagefunctions.hxx" -#include "edgedetection.hxx" -#include "vigra/utilities.hxx" -#include "vigra/numerictraits.hxx" - -#include "vigra/recursiveconvolution.hxx" -#include "vigra/separableconvolution.hxx" -#include "vigra/labelimage.hxx" -#include "vigra/mathutil.hxx" -#include "vigra/pixelneighborhood.hxx" -#include "vigra/linear_solve.hxx" -#endif - - -using namespace std; - using namespace vigra; - -class APImage - { - - public: |
From: <hug...@li...> - 2013-09-09 17:51:20
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/ffc8e011d6aa changeset: 6299:ffc8e011d6aa user: tmodes date: Thu May 30 18:00:59 2013 +0200 description: Removed unused nona_gui diffstat: src/hugin1/CMakeLists.txt | 1 - src/hugin1/nona_gui/CMakeLists.txt | 12 - src/hugin1/nona_gui/nona_gui.cpp | 310 ------------------------------------- src/hugin1/nona_gui/nona_gui_rc.rc | 16 - 4 files changed, 0 insertions(+), 339 deletions(-) diffs (361 lines): diff -r 175a37833068 -r ffc8e011d6aa src/hugin1/CMakeLists.txt --- a/src/hugin1/CMakeLists.txt Thu May 30 18:00:17 2013 +0200 +++ b/src/hugin1/CMakeLists.txt Thu May 30 18:00:59 2013 +0200 @@ -19,7 +19,6 @@ IF(OPENGL_FOUND) add_subdirectory(hugin) ENDIF(OPENGL_FOUND) - add_subdirectory(nona_gui) add_subdirectory(ptbatcher) add_subdirectory(calibrate_lens) ENDIF(wxWidgets_FOUND) diff -r 175a37833068 -r ffc8e011d6aa src/hugin1/nona_gui/CMakeLists.txt --- a/src/hugin1/nona_gui/CMakeLists.txt Thu May 30 18:00:17 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - -IF (WIN32) - add_executable(nona_gui WIN32 nona_gui.cpp nona_gui_rc.rc) -ELSE (WIN32) - add_executable(nona_gui nona_gui.cpp) -ENDIF (WIN32) - - -target_link_libraries(nona_gui ${common_libs} ${image_libs} huginbasewx ${wxWidgets_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES}) - -install(TARGETS nona_gui DESTINATION ${BINDIR}) - diff -r 175a37833068 -r ffc8e011d6aa src/hugin1/nona_gui/nona_gui.cpp --- a/src/hugin1/nona_gui/nona_gui.cpp Thu May 30 18:00:17 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,310 +0,0 @@ -// -*- c-basic-offset: 4 -*- - -/** @file nona_gui.cpp - * - * @brief stitcher, with wxwindows progress display - * - * @author Pablo d'Angelo <pab...@we...> - * - * $Id$ - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include <hugin_config.h> -#include <hugin_version.h> -#include "panoinc_WX.h" -#include "panoinc.h" - - -#include <fstream> -#include <sstream> -#include <vigra/error.hxx> -#include "PT/Stitcher.h" -#include "base_wx/MyProgressDialog.h" -#include "base_wx/huginConfig.h" -#include "base_wx/platform.h" - -#include <tiffio.h> - -// somewhere SetDesc gets defined.. this breaks wx/cmdline.h on OSX -#ifdef SetDesc -#undef SetDesc -#endif - -#include <wx/cmdline.h> - -using namespace vigra; -using namespace PT; -using namespace std; - -/** The application class for nona gui - * - * it contains the main frame. - */ -class nonaApp : public wxApp -{ -public: - - /** ctor. - */ - nonaApp(); - - /** dtor. - */ - virtual ~nonaApp(); - - /** pseudo constructor. with the ability to fail gracefully. - */ - virtual bool OnInit(); - - /** just for testing purposes */ - virtual int OnExit(); - -#ifdef __WXMAC__ - /** the wx calls this method when the app gets "Open file" AppleEvent */ - void MacOpenFile(const wxString &fileName); -#endif - -private: - wxLocale m_locale; -#ifdef __WXMAC__ - wxString m_macFileNameToOpenOnStart; -#endif -}; - - -nonaApp::nonaApp() -{ - // suppress tiff warnings - TIFFSetWarningHandler(0); - - DEBUG_TRACE("ctor"); -} - -nonaApp::~nonaApp() -{ - DEBUG_TRACE("dtor"); - DEBUG_TRACE("dtor end"); -} - -bool nonaApp::OnInit() -{ - SetAppName(wxT("nona_gui")); - m_locale.Init(wxLANGUAGE_DEFAULT); -#if defined __WXMSW__ - wxString nonaExeDir = getExePath(argv[0]); - - wxString nonaRoot; - wxFileName::SplitPath(nonaExeDir, &nonaRoot, NULL, NULL); - // locale setup - m_locale.AddCatalogLookupPathPrefix(nonaRoot + wxT("/share/locale")); -#elif (defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE) - // TODO: add localisation init -#else - DEBUG_INFO("add locale path: " << INSTALL_LOCALE_DIR); - m_locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR)); -#endif - - // set the name of locale recource to look for - m_locale.AddCatalog(wxT("hugin")); - -#if 0 -#ifdef wxUSE_UNIX - wxLog *logger=new wxLogStream(&cerr); - wxLog::SetActiveTarget(logger); -#endif -#endif - - // parse arguments - static const wxCmdLineEntryDesc cmdLineDesc[] = - { - //On wxWidgets 2.9, wide characters don't work here. - //On previous versions, the wxT macro is required for unicode builds. -#if wxCHECK_VERSION(2,9,0) - { wxCMD_LINE_SWITCH, "h", "help", "show this help message", - wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_OPTION, "o", "output", "output file" }, - { wxCMD_LINE_OPTION, "t", "threads", "number of threads", - wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_PARAM, NULL, NULL, "<project> <images>", -#else - { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help message"), - wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_OPTION, wxT("o"), wxT("output"), wxT("output file") }, - { wxCMD_LINE_OPTION, wxT("t"), wxT("threads"), wxT("number of threads"), - wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_PARAM, NULL, NULL, wxT("<project> <images>"), -#endif - wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE }, - { wxCMD_LINE_NONE } - }; - - wxCmdLineParser parser(cmdLineDesc, argc, argv); - - switch ( parser.Parse() ) { - case -1: // -h or --help was given, and help displayed so exit - return false; - break; - case 0: // all is well - break; - default: - wxLogError(_("Syntax error in parameters detected, aborting.")); - return false; - break; - } - - bool imgsFromCmdline = false; - - wxString scriptFile; -#ifdef __WXMAC__ - m_macFileNameToOpenOnStart = wxT(""); - wxYield(); - scriptFile = m_macFileNameToOpenOnStart; -#endif - if( parser.GetParamCount() == 0 && wxIsEmpty(scriptFile)) - { - wxFileDialog dlg(0,_("Specify project source project file"), - wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")), - wxT(""), wxT(""), - wxFD_OPEN, wxDefaultPosition); - dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT(""))); - if (dlg.ShowModal() == wxID_OK) { - wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory()); // remember for later - scriptFile = dlg.GetPath(); - } else { // bail - return false; - } - } else if(wxIsEmpty(scriptFile)) { - scriptFile = parser.GetParam(0); - if ( parser.GetParamCount() > 1) { - // load images. - imgsFromCmdline = true; - } - } - - DEBUG_DEBUG("input file is " << (const char *)scriptFile.mb_str(wxConvLocal)) - - wxFileName fname(scriptFile); - if ( !fname.FileExists() ) { - wxLogError( _("Could not find project file:") + scriptFile); - return false; - } - wxString path = fname.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); - - wxString outname; - - if ( !parser.Found(wxT("o"), &outname) ) { - // ask for output. - wxFileDialog dlg(0,_("Specify output image filename"), - wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")), - wxT(""), wxT(""), - wxFD_SAVE, wxDefaultPosition); - dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT(""))); - if (dlg.ShowModal() == wxID_OK) { - wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory()); // remember for later - outname = dlg.GetPath(); - } else { // bail - wxLogError( _("No project files specified")); - return false; - } - } - DEBUG_DEBUG("output file specified is " << (const char *)outname.mb_str(wxConvLocal)); - - long nThreads = wxThread::GetCPUCount(); - parser.Found(wxT("t"), & nThreads); - if (nThreads <= 0) nThreads = 1; - vigra_ext::ThreadManager::get().setNThreads((unsigned) nThreads); - - wxString basename; - wxString outpath; - wxFileName::SplitPath(outname, &outpath, &basename, NULL); - - //utils::StreamMultiProgressDisplay pdisp(cout); - MyProgressDialog pdisp(_("Stitching Panorama"), wxT(""), NULL, wxPD_ELAPSED_TIME | wxPD_AUTO_HIDE | wxPD_APP_MODAL ); - - Panorama pano; - PanoramaMemento newPano; - ifstream prjfile((const char *)scriptFile.mb_str(HUGIN_CONV_FILENAME)); - if (prjfile.bad()) { - wxLogError( wxString::Format(_("could not open script : %s"), scriptFile.c_str()) ); - return false; - } - int ptoVersion = 0; - if (newPano.loadPTScript(prjfile, ptoVersion, (const char *)path.mb_str(HUGIN_CONV_FILENAME))) { - pano.setMemento(newPano); - } else { - wxLogError( wxString::Format(_("error while parsing panotools script: %s"), scriptFile.c_str()) ); - return false; - } - - if (imgsFromCmdline) { - if (parser.GetParamCount() -1 != pano.getNrOfImages()) { - wxLogError(_("Wrong number of images specified on command line")); - return false; - } - for (size_t i = 0; i < pano.getNrOfImages(); i++) { - pano.setImageFilename(i, (const char *)parser.GetParam(i+1).mb_str(HUGIN_CONV_FILENAME)); - } - } - - PanoramaOptions opts = pano.getOptions(); - - // check for some options - - int w = opts.getWidth(); - int h = opts.getHeight(); - - cout << (const char *)wxString::Format(wxT("%s"), _("output image size: ")).mb_str(wxConvLocal) << w << "x" << h << std::endl; - wxString outfile; - if ( outpath != wxT("") ) { - outfile = outpath + wxFileName::GetPathSeparator() + basename; - } else { - outfile = basename; - } - DEBUG_DEBUG("output name: " << (const char *)outfile.mb_str(wxConvLocal)); - - try { - // stitch panorama - UIntSet simgs = pano.getActiveImages(); - PT::stitchPanorama(pano, opts, - pdisp, (const char *)outfile.mb_str(HUGIN_CONV_FILENAME), simgs); - } catch (std::exception & e) { - cerr << "caught exception: " << e.what() << std::endl; - return false; - } - - return false; -} - - -int nonaApp::OnExit() -{ - DEBUG_TRACE(""); - return 0; -} - - -#ifdef __WXMAC__ -// wx calls this method when the app gets "Open file" AppleEvent -void nonaApp::MacOpenFile(const wxString &fileName) -{ - m_macFileNameToOpenOnStart = fileName; -} -#endif - -// make wxwindows use this class as the main application -IMPLEMENT_APP(nonaApp) diff -r 175a37833068 -r ffc8e011d6aa src/hugin1/nona_gui/nona_gui_rc.rc --- a/src/hugin1/nona_gui/nona_gui_rc.rc Thu May 30 18:00:17 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// NOTE - The line above ensures that the build will -// not constantly recompile BUT if you make -// any changes to the included wx.rc you must -// force a recompilation of the resources!! - -AppIcon ICON "../hugin/xrc/data/hugin.ico" -IDI_ICON1 ICON "../hugin/xrc/data/hugin.ico" - -// set this to 1 if you don't want to use manifest resource (manifest resource -// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt -// for more information) -#define wxUSE_NO_MANIFEST 1 - -#include "wx/msw/wx.rc" - |
From: <hug...@li...> - 2013-09-09 17:51:19
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/8ec9aeda2daa changeset: 6296:8ec9aeda2daa user: tmodes date: Tue May 28 19:22:53 2013 +0200 description: Ignore outdated translations Moved outdated translation into separate folder Don't install outdated translation Removed outdated translation from preferences dialog diffstat: CMakeLists.txt | 1 + src/hugin1/hugin/PreferencesDialog.cpp | 8 + src/translations/bg.po | 8950 -------------------------------- src/translations/ca_ES.po | 8619 ------------------------------ src/translations/ko.po | 8551 ------------------------------ src/translations/outdated/bg.po | 8950 ++++++++++++++++++++++++++++++++ src/translations/outdated/ca_ES.po | 8619 ++++++++++++++++++++++++++++++ src/translations/outdated/ko.po | 8551 ++++++++++++++++++++++++++++++ src/translations/outdated/sl.po | 8263 +++++++++++++++++++++++++++++ src/translations/outdated/uk.po | 8870 +++++++++++++++++++++++++++++++ src/translations/sl.po | 8263 ----------------------------- src/translations/uk.po | 8870 ------------------------------- 12 files changed, 43262 insertions(+), 43253 deletions(-) diffs (truncated from 86610 to 500 lines): diff -r ebf6356f8147 -r 8ec9aeda2daa CMakeLists.txt --- a/CMakeLists.txt Fri May 24 17:16:05 2013 +0200 +++ b/CMakeLists.txt Tue May 28 19:22:53 2013 +0200 @@ -617,6 +617,7 @@ "/nona_gui/nona_gui$" "/stitch_project/hugin_stitch_project$" "/deghosting/deghosting_mask$" +"/outdated/" "/build/" "/CVS/" "/cmake_install.cmake$" diff -r ebf6356f8147 -r 8ec9aeda2daa src/hugin1/hugin/PreferencesDialog.cpp --- a/src/hugin1/hugin/PreferencesDialog.cpp Fri May 24 17:16:05 2013 +0200 +++ b/src/hugin1/hugin/PreferencesDialog.cpp Tue May 28 19:22:53 2013 +0200 @@ -114,12 +114,14 @@ lp = new long; *lp = wxLANGUAGE_BASQUE; lang_choice->Append(_("Basque"), lp); + /** outdated lp = new long; *lp = wxLANGUAGE_BULGARIAN; lang_choice->Append(_("Bulgarian"), lp); lp = new long; *lp = wxLANGUAGE_CATALAN; lang_choice->Append(_("Catalan"), lp); + */ lp = new long; *lp = wxLANGUAGE_CHINESE_SIMPLIFIED; lang_choice->Append(_("Chinese (Simplified)"), lp); @@ -153,9 +155,11 @@ lp = new long; *lp = wxLANGUAGE_JAPANESE; lang_choice->Append(_("Japanese"), lp); + /** outdated lp = new long; *lp = wxLANGUAGE_KOREAN; lang_choice->Append(_("Korean"), lp); + */ lp = new long; *lp = wxLANGUAGE_POLISH; lang_choice->Append(_("Polish"), lp); @@ -168,18 +172,22 @@ lp = new long; *lp = wxLANGUAGE_SLOVAK; lang_choice->Append(_("Slovak"), lp); + /** outdated lp = new long; *lp = wxLANGUAGE_SLOVENIAN; lang_choice->Append(_("Slovenian"), lp); + */ lp = new long; *lp = wxLANGUAGE_SPANISH; lang_choice->Append(_("Spanish"), lp); lp = new long; *lp = wxLANGUAGE_SWEDISH; lang_choice->Append(_("Swedish"), lp); + /** outdated lp = new long; *lp = wxLANGUAGE_UKRAINIAN; lang_choice->Append(_("Ukrainian"), lp); + */ lp = new long; *lp = wxLANGUAGE_FINNISH; lang_choice->Append(_("Finnish"), lp); diff -r ebf6356f8147 -r 8ec9aeda2daa src/translations/bg.po --- a/src/translations/bg.po Fri May 24 17:16:05 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8950 +0,0 @@ -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR Pablo dAngelo. -# -msgid "" -msgstr "" -"Project-Id-Version: bg\n" -"Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2013-02-24 12:50+0100\n" -"PO-Revision-Date: 2008-07-10 10:12+0200\n" -"Last-Translator: Svetoslav Stefanov <lfu...@gm...>\n" -"Language-Team: Bulgarian <bg...@li...>\n" -"Language: bg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Bulgarian\n" -"X-Poedit-Country: BULGARIA\n" - -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 -#, c-format -msgid "" -"External program %s not found as specified in preferences, reverting to " -"bundled version" -msgstr "" -"Външната програма %s, указана в параметрите, не беше намерена. Връщане към " -"включената в hugin." - -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57 -#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82 -#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/base_wx/wxLensDB.cpp:751 hugin1/base_wx/wxLensDB.cpp:764 -#: hugin1/base_wx/wxLensDB.cpp:810 hugin1/base_wx/wxLensDB.cpp:817 -#: hugin1/base_wx/wxLensDB.cpp:822 hugin1/base_wx/wxLensDB.cpp:969 -#: hugin1/calibrate_lens/LensCalFrame.cpp:401 -#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:287 -#: hugin1/hugin/GLViewer.cpp:299 hugin1/hugin/MainFrame.cpp:841 -#: hugin1/hugin/MainFrame.cpp:1470 hugin1/hugin/MainFrame.cpp:1518 -#: hugin1/hugin/MainFrame.cpp:2008 hugin1/hugin/MainFrame.cpp:2195 -#: hugin1/hugin/MainFrame.cpp:2267 hugin1/hugin/MainFrame.cpp:2305 -#: hugin1/hugin/MainFrame.cpp:2317 hugin1/hugin/MainFrame.cpp:2332 -#: hugin1/hugin/MainFrame.cpp:2340 -#: hugin1/hugin/OptimizePhotometricPanel.cpp:277 -#: hugin1/hugin/OptimizePhotometricPanel.cpp:306 -#: hugin1/hugin/PanoOperation.cpp:529 hugin1/hugin/PanoPanel.cpp:1015 -#: hugin1/hugin/PanoPanel.cpp:1186 hugin1/icpfind/AutoCtrlPointCreator.cpp:246 -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 -#: hugin1/ptbatcher/ProjectListBox.cpp:184 -#: hugin1/stitch_project/hugin_stitch_project.cpp:411 -msgid "Error" -msgstr "Грешка" - -#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69 -#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/hugin/MainFrame.cpp:1518 hugin1/hugin/MainFrame.cpp:2305 -#: hugin1/hugin/PanoPanel.cpp:1186 -#, c-format -msgid "External program %s not found in the bundle, reverting to system path" -msgstr "Външната програма %s не беше намерена. Връщане към включената в hugin." - -#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109 -#, fuzzy, c-format -msgid "Program %s not found in preferences, reverting to default value" -msgstr "" -"Външната програма %s, указана в параметрите, не беше намерена. Връщане към " -"включената в hugin." - -#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134 -#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145 -#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155 -#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166 -#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176 -#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187 -#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199 -#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224 -#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235 -#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245 -#: hugin1/base_wx/huginConfig.cpp:253 hugin1/base_wx/wxLensDB.cpp:233 -#: hugin1/base_wx/wxLensDB.cpp:609 hugin1/base_wx/wxLensDB.cpp:661 -#: hugin1/base_wx/wxLensDB.cpp:920 hugin1/base_wx/wxLensDB.cpp:925 -#: hugin1/calibrate_lens/LensCalFrame.cpp:414 -#: hugin1/calibrate_lens/LensCalFrame.cpp:602 -#: hugin1/calibrate_lens/LensCalFrame.cpp:625 -#: hugin1/calibrate_lens/LensCalFrame.cpp:633 -#: hugin1/calibrate_lens/LensCalFrame.cpp:768 -#: hugin1/calibrate_lens/LensCalFrame.cpp:776 -#: hugin1/calibrate_lens/LensCalFrame.cpp:802 -#: hugin1/calibrate_lens/LensCalFrame.cpp:874 -#: hugin1/hugin/CPDetectorDialog.cpp:121 hugin1/hugin/GLPreviewFrame.cpp:1585 -#: hugin1/hugin/GLPreviewFrame.cpp:1592 hugin1/hugin/GLPreviewFrame.cpp:1599 -#: hugin1/hugin/GLPreviewFrame.cpp:1613 hugin1/hugin/GLPreviewFrame.cpp:1620 -#: hugin1/hugin/GLPreviewFrame.cpp:1627 hugin1/hugin/MainFrame.cpp:837 -#: hugin1/hugin/MainFrame.cpp:1719 hugin1/hugin/MainFrame.cpp:2271 -#: hugin1/hugin/MaskEditorPanel.cpp:532 hugin1/hugin/PreferencesDialog.cpp:857 -#: hugin1/ptbatcher/FindPanoDialog.cpp:250 -#: hugin1/ptbatcher/FindPanoDialog.cpp:271 translations/xrc.cpp:174 -#: xrc.cpp:174 -msgid "Warning" -msgstr "Предупреждение" - -#: hugin1/base_wx/huginConfig.cpp:288 -#, fuzzy -msgid "first image" -msgstr "Этот снимок" - -#: hugin1/base_wx/huginConfig.cpp:289 -#, fuzzy -msgid "last image" -msgstr "Добавяне на изображение" - -#: hugin1/base_wx/huginConfig.cpp:291 -#, fuzzy -msgid "directory" -msgstr "Меркатора" - -#: hugin1/base_wx/huginConfig.cpp:292 hugin1/base_wx/LensTools.cpp:41 -#: hugin1/hugin/GLPreviewFrame.cpp:1488 hugin1/hugin/ImagesTree.cpp:370 -#: hugin1/hugin/PreviewFrame.cpp:630 -msgid "Equirectangular" -msgstr "Географска проекция" - -#: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 -#, fuzzy -msgid "Camera maker" -msgstr "Камера и обектив" - -#: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 -#, fuzzy -msgid "Camera model" -msgstr "Реакция на камерата:" - -#: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 -#: translations/xrc.cpp:223 translations/xrc.cpp:236 translations/xrc.cpp:300 -#: translations/xrc.cpp:316 xrc.cpp:223 xrc.cpp:236 xrc.cpp:300 xrc.cpp:316 -msgid "Lens" -msgstr "Обектив" - -#: hugin1/base_wx/huginConfig.cpp:335 -#, fuzzy -msgid "unknown projection" -msgstr "Неизвестная версия" - -#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 -msgid "Normal (rectilinear)" -msgstr "Нормален (праволинеен)" - -#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesTree.cpp:367 -msgid "Panoramic (cylindrical)" -msgstr "Панорамен (цилинричен)" - -#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:368 -msgid "Circular fisheye" -msgstr "Тип «рибешко око»" - -#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:369 -msgid "Full frame fisheye" -msgstr "«рибешко око» на цял кадър" - -#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:371 -#: hugin1/hugin/PanoPanel.cpp:153 -#, fuzzy -msgid "Orthographic" -msgstr "Стереографическая" - -#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesTree.cpp:372 -#: hugin1/hugin/PanoPanel.cpp:143 -msgid "Stereographic" -msgstr "Стереографическая" - -#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesTree.cpp:373 -#: hugin1/hugin/PanoPanel.cpp:154 -msgid "Equisolid" -msgstr "" - -#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:374 -msgid "Fisheye Thoby" -msgstr "" - -#: hugin1/base_wx/LensTools.cpp:219 -msgid "Load lens parameters" -msgstr "Зареждане на параметри на обектива" - -#: hugin1/base_wx/LensTools.cpp:221 -msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*" -msgstr "Файлове с данни за обектив (*.ini)|*.ini|Всички файлове (*.*)|*.*" - -#: hugin1/base_wx/LensTools.cpp:242 -msgid "" -"Incompatible lens parameter file, image sizes do not match\n" -"Apply settings anyway?" -msgstr "" -"Несъвместим файл с параметри на обектива: \n" -"размерът на изображенията не съвпада\n" -"Да се приложат ли настройките въпреки това?" - -#: hugin1/base_wx/LensTools.cpp:242 -msgid "Error loading lens parameters" -msgstr "Грешка при зареждане параметрите на обектива" - -#: hugin1/base_wx/LensTools.cpp:345 hugin1/calibrate_lens/LensCalFrame.cpp:739 -msgid "Save lens parameters file" -msgstr "Запазване на файл с параметрите на обектива" - -#: hugin1/base_wx/LensTools.cpp:347 hugin1/calibrate_lens/LensCalFrame.cpp:741 -msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" -msgstr "Файлове с данни за обектив (*.ini)|*.ini|Всички файлове (*)|*" - -#: hugin1/base_wx/LensTools.cpp:363 -msgid "Please select an image and try again" -msgstr "Изберете изображение и опитайте отново" - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160 -#, c-format -msgid "Failed to kill process %ld, error %d: %s" -msgstr "Процесът %ld не беше убит, грешка %d: %s" - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179 -#, fuzzy, c-format -msgid "Error pausing process %ld, code 1" -msgstr "Грешка при отваряне на проекта: " - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196 -#, fuzzy, c-format -msgid "Error pausing process %ld, code 2" -msgstr "Грешка при отваряне на проекта: " - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 -#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:147 -#: translations/xrc.cpp:213 translations/xrc.cpp:252 translations/xrc.cpp:302 -#: translations/xrc.cpp:318 translations/xrc.cpp:325 translations/xrc.cpp:506 -#: translations/xrc.cpp:539 translations/xrc.cpp:543 translations/xrc.cpp:547 -#: translations/xrc.cpp:630 translations/xrc.cpp:655 translations/xrc.cpp:795 -#: translations/xrc.cpp:820 translations/xrc.cpp:1048 xrc.cpp:147 xrc.cpp:213 -#: xrc.cpp:252 xrc.cpp:302 xrc.cpp:318 xrc.cpp:325 xrc.cpp:506 xrc.cpp:539 -#: xrc.cpp:543 xrc.cpp:547 xrc.cpp:630 xrc.cpp:655 xrc.cpp:795 xrc.cpp:820 -#: xrc.cpp:1048 -msgid "Cancel" -msgstr "Отказ" - -#: hugin1/base_wx/MyExternalCmdExecDialog.h:189 -msgid "Command Line Progress" -msgstr "Прогрес на командния ред" - -#: hugin1/base_wx/MyProgressDialog.cpp:36 -msgid "Elapsed time : " -msgstr "Изминало време : " - -#: hugin1/base_wx/MyProgressDialog.h:102 -msgid "Optimizing Panorama" -msgstr "Оптимизиране на панорамата" - -#: hugin1/base_wx/platform.cpp:431 -#, c-format -msgid "" -"The filename(s) contains one of the following invalid characters: %s\n" -"Hugin can not work with these filenames. Please rename your file(s) and try " -"again." -msgstr "" - -#: hugin1/base_wx/platform.h:40 -#, fuzzy -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Всички изображения|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|Файлове JPEG (*." -"jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Всички файлове (*)|*" - -#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 -#: hugin1/base_wx/PTWXDlg.cpp:122 -msgid "Panorama Tools" -msgstr "Panorama Tools" - -#: hugin1/base_wx/RunStitchPanel.cpp:141 hugin1/base_wx/RunStitchPanel.cpp:310 -msgid "Could not open project file:" -msgstr "Проектният файл не може да бъде отворен:" - -#: hugin1/base_wx/RunStitchPanel.cpp:151 hugin1/base_wx/RunStitchPanel.cpp:318 -#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:91 -#, c-format -msgid "could not open script : %s" -msgstr "Скриптът не може да се отвори: %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:172 hugin1/base_wx/RunStitchPanel.cpp:326 -#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:128 -#, c-format -msgid "error while parsing panotools script: %s" -msgstr "Грешка при синтактическия разбор на скрипта panotools: %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:216 hugin1/base_wx/RunStitchPanel.cpp:233 -#: hugin1/base_wx/RunStitchPanel.cpp:352 -msgid "Could not create temporary file" -msgstr "Не може да бъде създаден временен файл" - -#: hugin1/base_wx/RunStitchPanel.cpp:273 -msgid "" -"Overwrite existing images?\n" -"\n" -msgstr "" -"Презаписване на съществуващите изображения?\n" -"\n" - -#: hugin1/base_wx/RunStitchPanel.cpp:273 -msgid "Overwrite existing images" -msgstr "Презаписване на съществуващите изображения" - -#: hugin1/base_wx/RunStitchPanel.cpp:288 -#, c-format -msgid "Stitching %s" -msgstr "Събиране на %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:292 -#, c-format -msgid "" -"Error while stitching project\n" -"%s" -msgstr "" -"Грешка при събирането на проекта\n" -"%s" - -#: hugin1/base_wx/RunStitchPanel.cpp:293 hugin1/base_wx/RunStitchPanel.cpp:299 -#: hugin1/stitch_project/hugin_stitch_project.cpp:177 -msgid "Error during stitching" -msgstr "Грешка по време на събирането" - -#: hugin1/base_wx/RunStitchPanel.cpp:371 -#, fuzzy, c-format -msgid "" -"Error while running assistant\n" -"%s" -msgstr "Грешка при синтактическия разбор на скрипта panotools: %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:372 hugin1/base_wx/RunStitchPanel.cpp:380 -#, fuzzy -msgid "Error during running assistant" -msgstr "Грешка по време на събирането" - -#: hugin1/base_wx/wxLensDB.cpp:233 -#, fuzzy, c-format -msgid "The input \"%s\" is not a valid number." -msgstr "Въведете валиден номер." - -#: hugin1/base_wx/wxLensDB.cpp:294 translations/xrc.cpp:194 -#: translations/xrc.cpp:211 translations/xrc.cpp:259 translations/xrc.cpp:826 -#: translations/xrc.cpp:909 xrc.cpp:194 xrc.cpp:211 xrc.cpp:259 xrc.cpp:826 -#: xrc.cpp:909 -msgid "Focal length multiplier:" -msgstr "Множител на фокусното разстояние:" - -#: hugin1/base_wx/wxLensDB.cpp:299 -#, fuzzy, c-format -msgid "%d lenses found." -msgstr "Файл не найден" - -#: hugin1/base_wx/wxLensDB.cpp:303 -#, fuzzy -msgid "No lens found." -msgstr "Не е открита сходна точка" - -#: hugin1/base_wx/wxLensDB.cpp:609 -msgid "" -"There is too little information for saving data into database. Please check " -"your input!" -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:660 -#, c-format -msgid "" -"You selected the folder \"%s\" to save your database file.\n" -"This is not the default folder. You won't be able to automatically load this " -"information back into Hugin.\n" -"The default folder for the database files is \"%s\".\n" -"Do you want to proceed anyway?" -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:708 -#, fuzzy -msgid "Save lens into database file" -msgstr "Запазване на файл с параметрите на обектива" - -#: hugin1/base_wx/wxLensDB.cpp:710 hugin1/base_wx/wxLensDB.cpp:948 -#, fuzzy -msgid "Lensfun database files (*.xml)|*.xml" -msgstr "Файлове PTmender (*.txt)|*.txt" - -#: hugin1/base_wx/wxLensDB.cpp:751 hugin1/base_wx/wxLensDB.cpp:764 -#: hugin1/base_wx/wxLensDB.cpp:810 hugin1/base_wx/wxLensDB.cpp:969 -msgid "Could not save information into database file." -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:817 -msgid "Could not initialize database." -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:821 -#, c-format -msgid "" -"The current selected lens does not match with the information about this " -"lens in the selected database file.\n" -"Could not proceed.\n" -"(Error code: %d)" -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:920 -msgid "The maker field contains only an empty string." -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:925 -msgid "The model field contains only an empty string." -msgstr "" - -#: hugin1/base_wx/wxLensDB.cpp:946 -#, fuzzy -msgid "Save camera into database file" -msgstr "Запазване на конфигурацията на обектива във файл" - -#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:192 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:80 -msgid "xrc directory not found in bundle" -msgstr "Папката xrc не е намерена" - -#: hugin1/calibrate_lens/LensCalApp.cpp:66 -#: hugin1/calibrate_lens/LensCalApp.cpp:74 -#: hugin1/calibrate_lens/LensCalApp.cpp:80 |
From: <hug...@li...> - 2013-09-09 17:51:17
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/710f505b947f changeset: 6295:710f505b947f user: tmodes date: Fri May 24 17:16:05 2013 +0200 description: Fixes memory overflow (Patch by Matthieu) diffstat: src/hugin_cpfind/cpfind/Utils.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r f45c792caf3e -r 710f505b947f src/hugin_cpfind/cpfind/Utils.cpp --- a/src/hugin_cpfind/cpfind/Utils.cpp Fri May 24 16:55:51 2013 +0200 +++ b/src/hugin_cpfind/cpfind/Utils.cpp Fri May 24 17:16:05 2013 +0200 @@ -76,7 +76,8 @@ SInt32 ramSize; if(Gestalt(gestaltPhysicalRAMSizeInMegabytes, &ramSize)==noErr) { - return ramSize * 1024 * 1024; + unsigned long long _ramSize = ramSize; + return _ramSize * 1024 * 1024; } else { |
From: <hug...@li...> - 2013-09-09 17:51:17
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/ebf6356f8147 changeset: 6294:ebf6356f8147 user: tmodes date: Fri May 24 17:16:05 2013 +0200 description: Fixes memory overflow (Patch by Matthieu) diffstat: src/hugin_cpfind/cpfind/Utils.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 40ce1830593c -r ebf6356f8147 src/hugin_cpfind/cpfind/Utils.cpp --- a/src/hugin_cpfind/cpfind/Utils.cpp Fri May 24 16:55:37 2013 +0200 +++ b/src/hugin_cpfind/cpfind/Utils.cpp Fri May 24 17:16:05 2013 +0200 @@ -76,7 +76,8 @@ SInt32 ramSize; if(Gestalt(gestaltPhysicalRAMSizeInMegabytes, &ramSize)==noErr) { - return ramSize * 1024 * 1024; + unsigned long long _ramSize = ramSize; + return _ramSize * 1024 * 1024; } else { |
From: <hug...@li...> - 2013-09-09 17:51:17
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/f45c792caf3e changeset: 6293:f45c792caf3e user: tmodes date: Fri May 24 16:55:51 2013 +0200 description: More fixes for Russian translation (Victor Nezhelskiy) diffstat: src/translations/ru.po | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diffs (68 lines): diff -r ee6cc0c77f19 -r f45c792caf3e src/translations/ru.po --- a/src/translations/ru.po Thu May 23 18:08:52 2013 +0200 +++ b/src/translations/ru.po Fri May 24 16:55:51 2013 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: Hugin 2011.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" -"PO-Revision-Date: 2013-05-17 10:05+0400\n" +"PO-Revision-Date: 2013-05-24 13:59+0400\n" "Last-Translator: Нежельский Виктор Андреевич <nez...@ya...>\n" "Language-Team: Russian <gno...@li...>\n" "Language: ru\n" @@ -2481,15 +2481,11 @@ #: hugin1/hugin/PanoOperation.cpp:166 msgid "Add individual images..." -msgstr "" -"Добавить отдельные\n" -"снимки..." +msgstr "Добавить отдельные снимки..." #: hugin1/hugin/PanoOperation.cpp:255 msgid "Add time-series of images..." -msgstr "" -"Добавить одновременно \n" -"сделанные снимки..." +msgstr "Добавить одновременно сделанные снимки..." #: hugin1/hugin/PanoOperation.cpp:368 msgid "No matching images found." @@ -2680,9 +2676,8 @@ msgstr "Сжатие:" #: hugin1/hugin/PanoPanel.cpp:142 -#, fuzzy msgid "Fisheye" -msgstr "РыбийГлаз Thoby" +msgstr "РыбийГлаз" #: hugin1/hugin/PanoPanel.cpp:144 msgid "Mercator" @@ -4771,7 +4766,7 @@ #: translations/xrc.cpp:280 xrc.cpp:280 msgid "Corrected" -msgstr "Испреленный" +msgstr "Исправленный" #: translations/xrc.cpp:281 xrc.cpp:281 msgid "Show lines" @@ -5107,7 +5102,7 @@ #: translations/xrc.cpp:1019 translations/xrc.cpp:1033 xrc.cpp:396 xrc.cpp:415 #: xrc.cpp:425 xrc.cpp:1019 xrc.cpp:1033 msgid "&Preferences" -msgstr "Н&астроки" +msgstr "Н&астройки" #: translations/xrc.cpp:397 translations/xrc.cpp:1021 xrc.cpp:397 xrc.cpp:1021 msgid "&New" @@ -6439,7 +6434,7 @@ #: translations/xrc.cpp:797 xrc.cpp:797 msgid "Preferences - hugin" -msgstr "Предпочтения - Hugin" +msgstr "Настройки - Hugin" #: translations/xrc.cpp:798 translations/xrc.cpp:864 translations/xrc.cpp:948 #: xrc.cpp:798 xrc.cpp:864 xrc.cpp:948 |
From: <hug...@li...> - 2013-09-09 17:51:16
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/40ce1830593c changeset: 6292:40ce1830593c user: tmodes date: Fri May 24 16:55:37 2013 +0200 description: More fixes for Russian translation (Victor Nezhelskiy) diffstat: src/translations/ru.po | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diffs (68 lines): diff -r b542cf210f63 -r 40ce1830593c src/translations/ru.po --- a/src/translations/ru.po Thu May 23 18:09:34 2013 +0200 +++ b/src/translations/ru.po Fri May 24 16:55:37 2013 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: Hugin 2011.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" -"PO-Revision-Date: 2013-05-17 10:05+0400\n" +"PO-Revision-Date: 2013-05-24 13:59+0400\n" "Last-Translator: Нежельский Виктор Андреевич <nez...@ya...>\n" "Language-Team: Russian <gno...@li...>\n" "Language: ru\n" @@ -2481,15 +2481,11 @@ #: hugin1/hugin/PanoOperation.cpp:166 msgid "Add individual images..." -msgstr "" -"Добавить отдельные\n" -"снимки..." +msgstr "Добавить отдельные снимки..." #: hugin1/hugin/PanoOperation.cpp:255 msgid "Add time-series of images..." -msgstr "" -"Добавить одновременно \n" -"сделанные снимки..." +msgstr "Добавить одновременно сделанные снимки..." #: hugin1/hugin/PanoOperation.cpp:368 msgid "No matching images found." @@ -2680,9 +2676,8 @@ msgstr "Сжатие:" #: hugin1/hugin/PanoPanel.cpp:142 -#, fuzzy msgid "Fisheye" -msgstr "РыбийГлаз Thoby" +msgstr "РыбийГлаз" #: hugin1/hugin/PanoPanel.cpp:144 msgid "Mercator" @@ -4771,7 +4766,7 @@ #: translations/xrc.cpp:280 xrc.cpp:280 msgid "Corrected" -msgstr "Испреленный" +msgstr "Исправленный" #: translations/xrc.cpp:281 xrc.cpp:281 msgid "Show lines" @@ -5107,7 +5102,7 @@ #: translations/xrc.cpp:1019 translations/xrc.cpp:1033 xrc.cpp:396 xrc.cpp:415 #: xrc.cpp:425 xrc.cpp:1019 xrc.cpp:1033 msgid "&Preferences" -msgstr "Н&астроки" +msgstr "Н&астройки" #: translations/xrc.cpp:397 translations/xrc.cpp:1021 xrc.cpp:397 xrc.cpp:1021 msgid "&New" @@ -6439,7 +6434,7 @@ #: translations/xrc.cpp:797 xrc.cpp:797 msgid "Preferences - hugin" -msgstr "Предпочтения - Hugin" +msgstr "Настройки - Hugin" #: translations/xrc.cpp:798 translations/xrc.cpp:864 translations/xrc.cpp:948 #: xrc.cpp:798 xrc.cpp:864 xrc.cpp:948 |
From: <hug...@li...> - 2013-09-09 17:51:15
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/92100d8e5da5 changeset: 6290:92100d8e5da5 user: tmodes date: Thu May 23 18:00:38 2013 +0200 description: Updated Russian translation (Victor Nezhelskiy) diffstat: src/translations/ru.po | 1109 +++++++++++++++++++++++------------------------ 1 files changed, 551 insertions(+), 558 deletions(-) diffs (truncated from 3625 to 500 lines): diff -r 636261f9cecf -r 92100d8e5da5 src/translations/ru.po --- a/src/translations/ru.po Wed May 22 23:38:32 2013 +0200 +++ b/src/translations/ru.po Thu May 23 18:00:38 2013 +0200 @@ -8,16 +8,17 @@ "Project-Id-Version: Hugin 2011.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" -"PO-Revision-Date: 2013-01-22 11:02+0300\n" -"Last-Translator: Denis Silakov <den...@ro...>\n" +"PO-Revision-Date: 2013-05-17 10:05+0400\n" +"Last-Translator: Нежельский Виктор Андреевич <nez...@ya...>\n" "Language-Team: Russian <gno...@li...>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n" "%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.5.5\n" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 #, c-format @@ -25,8 +26,8 @@ "External program %s not found as specified in preferences, reverting to " "bundled version" msgstr "" -"Внешняя программа %s, указанная в параметрах, не была найдена. Возврат к " -"версии из поставки Hugin." +"Внешняя программа %s, указанная в параметрах, не найдена. Возврат к версии " +"из поставки Hugin." #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57 #: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82 @@ -59,15 +60,14 @@ #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" -"Внешняя программа %s не была найдена в поставке Hugin. Возврат к системному " -"пути." +"Внешняя программа %s не найдена в поставке Hugin, возврат к системному пути" #: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109 #, c-format msgid "Program %s not found in preferences, reverting to default value" msgstr "" -"Внешняя программа %s, указанная в параметрах, не была найдена. Возврат к " -"исходному значению." +"Внешняя программа %s, указанная в параметрах, не найдена, возврат к " +"исходному значению" #: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134 #: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145 @@ -149,11 +149,11 @@ #: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:368 msgid "Circular fisheye" -msgstr "Круговой «рыбий глаз»" +msgstr "Круговой РыбийГлаз" #: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:369 msgid "Full frame fisheye" -msgstr "Полнокадровый «рыбий глаз»" +msgstr "Полнокадровый РыбийГлаз" #: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:371 #: hugin1/hugin/PanoPanel.cpp:153 @@ -172,7 +172,7 @@ #: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:374 msgid "Fisheye Thoby" -msgstr "Рыбий глаз Thoby" +msgstr "РыбийГлаз Thoby" #: hugin1/base_wx/LensTools.cpp:219 msgid "Load lens parameters" @@ -187,17 +187,17 @@ "Incompatible lens parameter file, image sizes do not match\n" "Apply settings anyway?" msgstr "" -"Не поддерживаемый файл параметров объектива: \n" -"размеры изображений не совпадают\n" +"Не поддерживаемый файл параметров объектива, \n" +"размеры снимков не совпадают\n" "Всё равно применить параметры?" #: hugin1/base_wx/LensTools.cpp:242 msgid "Error loading lens parameters" -msgstr "Ошибка при загрузке параметров объектива" +msgstr "Ошибка загрузки параметров объектива" #: hugin1/base_wx/LensTools.cpp:345 hugin1/calibrate_lens/LensCalFrame.cpp:739 msgid "Save lens parameters file" -msgstr "Сохранить файл с параметрами объектива" +msgstr "Сохранить файл параметров объектива" #: hugin1/base_wx/LensTools.cpp:347 hugin1/calibrate_lens/LensCalFrame.cpp:741 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" @@ -210,17 +210,17 @@ #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160 #, c-format msgid "Failed to kill process %ld, error %d: %s" -msgstr "Не удалось убить процесс %ld, ошибка %d: %s" +msgstr "Не удалось убрать процесс %ld, ошибка %d: %s" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179 #, c-format msgid "Error pausing process %ld, code 1" -msgstr "Ошибка при паузе процесса %ld, код 1" +msgstr "Ошибка приостановки процесса %ld, код 1" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196 #, c-format msgid "Error pausing process %ld, code 2" -msgstr "Ошибка при паузе процесса %ld, код 2" +msgstr "Ошибка приостановки процесса %ld, код 2" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 #: hugin1/ptbatcher/RunStitchFrame.cpp:43 @@ -238,7 +238,7 @@ #: hugin1/base_wx/MyExternalCmdExecDialog.h:189 msgid "Command Line Progress" -msgstr "Прогресс для командной строки" +msgstr "Прогресс командной строки" #: hugin1/base_wx/MyProgressDialog.cpp:36 msgid "Elapsed time : " @@ -246,7 +246,7 @@ #: hugin1/base_wx/MyProgressDialog.h:102 msgid "Optimizing Panorama" -msgstr "Производится оптимизация панорамы" +msgstr "Оптимизация панорамы" #: hugin1/base_wx/platform.cpp:431 #, c-format @@ -255,8 +255,9 @@ "Hugin can not work with these filenames. Please rename your file(s) and try " "again." msgstr "" -"В именах файлов есть один из этих запрещённых символов: %s\n" -"Hugin не может работать с такими файлами. Переименуйте их и попробуйте снова." +"В имени файла(ов) есть один из неразрешенных символов: %s\n" +"Hugin не может работать с такими файлами. Переименуйте ваш файл(ы) и " +"попробуйте снова." #: hugin1/base_wx/platform.h:40 msgid "" @@ -266,10 +267,10 @@ "tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." "hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" msgstr "" -"Все файлы изображений|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" -"*.EXR|Файлы JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Файлы TIFF (*.tif," -"*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы HDR (*." +"Все файлы снимков|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" +"Файлы JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Файлы TIFF (*.tif,*." +"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы HDR (*." "hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Все файлы (*)|*" #: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 @@ -279,19 +280,19 @@ #: hugin1/base_wx/RunStitchPanel.cpp:141 hugin1/base_wx/RunStitchPanel.cpp:310 msgid "Could not open project file:" -msgstr "Не удалось открыть проектный файл:" +msgstr "Не удалось открыть файл проекта:" #: hugin1/base_wx/RunStitchPanel.cpp:151 hugin1/base_wx/RunStitchPanel.cpp:318 #: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:91 #, c-format msgid "could not open script : %s" -msgstr "Не удалось открыть сценарий: %s" +msgstr "не удалось открыть скрипт: %s" #: hugin1/base_wx/RunStitchPanel.cpp:172 hugin1/base_wx/RunStitchPanel.cpp:326 #: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:128 #, c-format msgid "error while parsing panotools script: %s" -msgstr "Ошибка при синтаксическом разборе сценария panotools: %s" +msgstr "ошибка при синтаксическом разборе скрипта panotools: %s" #: hugin1/base_wx/RunStitchPanel.cpp:216 hugin1/base_wx/RunStitchPanel.cpp:233 #: hugin1/base_wx/RunStitchPanel.cpp:352 @@ -313,7 +314,7 @@ #: hugin1/base_wx/RunStitchPanel.cpp:288 #, c-format msgid "Stitching %s" -msgstr "Собирается %s" +msgstr "Сшивается %s" #: hugin1/base_wx/RunStitchPanel.cpp:292 #, c-format @@ -327,7 +328,7 @@ #: hugin1/base_wx/RunStitchPanel.cpp:293 hugin1/base_wx/RunStitchPanel.cpp:299 #: hugin1/stitch_project/hugin_stitch_project.cpp:177 msgid "Error during stitching" -msgstr "Во время сборки произошла ошибка" +msgstr "Ошибка в процессе сборки" #: hugin1/base_wx/RunStitchPanel.cpp:371 #, c-format @@ -345,7 +346,7 @@ #: hugin1/base_wx/wxLensDB.cpp:233 #, c-format msgid "The input \"%s\" is not a valid number." -msgstr "Введенное \"%s\" не является числом." +msgstr "Введено \"%s\" - это недопустимое число." #: hugin1/base_wx/wxLensDB.cpp:294 translations/xrc.cpp:194 #: translations/xrc.cpp:211 translations/xrc.cpp:259 translations/xrc.cpp:826 @@ -357,7 +358,7 @@ #: hugin1/base_wx/wxLensDB.cpp:299 #, c-format msgid "%d lenses found." -msgstr "Найдено %d объективов" +msgstr "%d объективов найдено." #: hugin1/base_wx/wxLensDB.cpp:303 msgid "No lens found." @@ -368,7 +369,7 @@ "There is too little information for saving data into database. Please check " "your input!" msgstr "" -"Слишком мало информации для сохранения в базу данных. Проверьте входные " +"Слишком мало информации для сохранения в базу данных. Проверьте введенные " "данные!" #: hugin1/base_wx/wxLensDB.cpp:660 @@ -380,11 +381,11 @@ "The default folder for the database files is \"%s\".\n" "Do you want to proceed anyway?" msgstr "" -"Вы выбрали директорию \"%s\" для сохранения вашей базы данных.\n" +"Вы выбрали директорию \"%s\" для сохранения файла вашей базы данных.\n" "Эта директория не является используемой по умолчанию. Вы не сможете " "автоматически загрузить свои данных обратно в Hugin.\n" "Директория по умолчанию для файлов баз данных: \"%s\".\n" -"Действительно продолжить?" +"Хотите всеравно продолжить?" #: hugin1/base_wx/wxLensDB.cpp:708 msgid "Save lens into database file" @@ -411,18 +412,18 @@ "Could not proceed.\n" "(Error code: %d)" msgstr "" -"Выбранный объектив не соответствует информации оь этом объективе в выбранной " +"Выбранный объектив не соответствует информации об этом объективе в выбранной " "базе данных.\n" "Невозможно продолжить.\n" "(Код ошибки: %d)" #: hugin1/base_wx/wxLensDB.cpp:920 msgid "The maker field contains only an empty string." -msgstr "Поле производителя содержит только пустую строку" +msgstr "Поле производителя содержит только пустую строку." #: hugin1/base_wx/wxLensDB.cpp:925 msgid "The model field contains only an empty string." -msgstr "Поле модели содержит только пустую строку" +msgstr "Поле модели содержит только пустую строку." #: hugin1/base_wx/wxLensDB.cpp:946 msgid "Save camera into database file" @@ -431,7 +432,7 @@ #: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:192 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80 msgid "xrc directory not found in bundle" -msgstr "Каталог с файлами xrc не найден" +msgstr "xrc каталог не найден в поставке" #: hugin1/calibrate_lens/LensCalApp.cpp:66 #: hugin1/calibrate_lens/LensCalApp.cpp:74 @@ -449,12 +450,12 @@ #: hugin1/ptbatcher/PTBatcherGUI.cpp:91 #: hugin1/stitch_project/hugin_stitch_project.cpp:306 msgid "Translations not found in bundle" -msgstr "Файлы локализации не найдены" +msgstr "Файлы локализации не найдены в поставке" #: hugin1/calibrate_lens/LensCalApp.cpp:79 hugin1/hugin/huginApp.cpp:212 #: hugin1/ptbatcher/PTBatcherGUI.cpp:96 msgid "lensfun directory not found in bundle" -msgstr "Каталог lensfun не найден" +msgstr "Каталог lensfun не найден в поставке" #: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:227 #: hugin1/ptbatcher/PTBatcherGUI.cpp:119 @@ -462,12 +463,12 @@ "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" msgstr "" -"Каталог с файлами xrc не найден, Hugin не был корректно установлен.\n" -"Поиск производился здесь:" +"xrc каталог не найден, Hugin не был корректно установлен\n" +"Путь поиска:" #: hugin1/calibrate_lens/LensCalFrame.cpp:170 msgid "Hugin Lens calibration GUI" -msgstr "Интерфейс калибровки объектива" +msgstr "Hugin интерфейс калибровки объективов" #: hugin1/calibrate_lens/LensCalFrame.cpp:373 #, c-format @@ -486,10 +487,9 @@ "already added image(s).\n" "Please check the image again, if you selected the correct images." msgstr "" -"Информация EXIF из добавляемых изображений (%s) не согласуется с ранее " -"добавленными изображениями.\n" -"Пожалуйста, проверьте изображения снова, что вы выбрали правильные " -"изображения." +"Информация EXIF из добавляемых снимков (%s) не согласуется с ранее " +"добавленными.\n" +"Проверьте снимки снова, чтобы были правильные." #: hugin1/calibrate_lens/LensCalFrame.cpp:422 #: hugin1/hugin/PanoOperation.cpp:88 hugin1/hugin/wxPanoCommand.cpp:420 @@ -517,7 +517,7 @@ "Please check your inputs." msgstr "" "В полях ввода есть недопустимые значения.\n" -"Пожалуйста, проверьте введенные значения." +"Проверьте введенные значения." #: hugin1/calibrate_lens/LensCalFrame.cpp:611 msgid "Detecting edges..." @@ -525,7 +525,7 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:613 msgid "Finding lines..." -msgstr "поиск линий..." +msgstr "Поиск линий..." #: hugin1/calibrate_lens/LensCalFrame.cpp:617 #: hugin1/calibrate_lens/LensCalFrame.cpp:733 @@ -551,7 +551,7 @@ #: hugin1/hugin/MaskEditorPanel.cpp:443 #, c-format msgid "File %s exists. Overwrite?" -msgstr "Файл %s уже существует. Перезаписать его?" +msgstr "Файл %s уже существует. Перезаписать?" #: hugin1/calibrate_lens/LensCalFrame.cpp:753 #: hugin1/calibrate_lens/LensCalFrame.cpp:818 hugin1/hugin/MainFrame.cpp:873 @@ -593,7 +593,7 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:807 hugin1/hugin/MainFrame.cpp:862 msgid "Project files (*.pto)|*.pto|All files (*)|*" -msgstr "Проектные файлы (*.pto)|*.pto|Все файлы (*)|*" +msgstr "Файлы проектов (*.pto)|*.pto|Все файлы (*)|*" #: hugin1/hugin/AboutDialog.cpp:130 #, c-format @@ -602,11 +602,11 @@ #: hugin1/hugin/AboutDialog.cpp:133 msgid "64 bit" -msgstr "64 bit" +msgstr "64 битная" #: hugin1/hugin/AboutDialog.cpp:135 msgid "32 bit" -msgstr "32 bit" +msgstr "32 битная" #: hugin1/hugin/AboutDialog.cpp:136 #, c-format @@ -616,7 +616,7 @@ #: hugin1/hugin/AboutDialog.cpp:139 #, c-format msgid "Free memory: %ld kiB" -msgstr "Свободно памяти: %ld Кбайт" +msgstr "Свободная память: %ld Кбайт" #: hugin1/hugin/AboutDialog.cpp:142 #, c-format @@ -646,7 +646,7 @@ #: hugin1/hugin/AboutDialog.cpp:182 #, c-format msgid "Path to user lensfun database: %s" -msgstr "Расположение базы данных lensfun пльзователя: %s" +msgstr "Расположение базы данных lensfun пользователя: %s" #: hugin1/hugin/AboutDialog.cpp:183 msgid "Libraries" @@ -666,7 +666,7 @@ "Please check your inputs." msgstr "" "Как минимум одно поле ввода не заполнено.\n" -"Проверьте их." +"Проверьте введенные данные." #: hugin1/hugin/CPDetectorDialog.cpp:215 msgid "Try to connect all overlapping images." @@ -707,7 +707,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:145 hugin1/hugin/CPListFrame.cpp:309 #: hugin1/hugin/CPListFrame.cpp:316 msgid "Alignment" -msgstr "Объединение" +msgstr "Выравнивание" #: hugin1/hugin/CPEditorPanel.cpp:146 hugin1/hugin/CPListFrame.cpp:310 #: hugin1/hugin/CPListFrame.cpp:317 @@ -720,11 +720,11 @@ #: hugin1/hugin/CPEditorPanel.cpp:543 msgid "new control point added" -msgstr "Добавлена новая контрольная точка" +msgstr "добавлена новая контрольная точка" #: hugin1/hugin/CPEditorPanel.cpp:666 hugin1/hugin/CPEditorPanel.cpp:891 msgid "searching similar points..." -msgstr "Идёт поиск аналогичных точек..." +msgstr "поиск похожих точек..." #: hugin1/hugin/CPEditorPanel.cpp:685 hugin1/hugin/CPEditorPanel.cpp:809 msgid "Error during Fine-tune" @@ -742,11 +742,11 @@ #: hugin1/hugin/CPEditorPanel.cpp:702 hugin1/hugin/CPEditorPanel.cpp:832 msgid "change points, or press right mouse button to add the pair" -msgstr "Смените точки, либо нажмите правую клавишу мыши, чтобы добавить пару" +msgstr "смените точки, либо нажмите правую кнопку мыши, чтобы добавить пару" #: hugin1/hugin/CPEditorPanel.cpp:722 msgid "Estimated point outside image" -msgstr "Расчётная точка вне изображения" +msgstr "Расчётная точка вне снимка" #: hugin1/hugin/CPEditorPanel.cpp:972 msgid "No similar point found." @@ -772,7 +772,7 @@ "Correlation coefficient (%.3f) is lower than the threshold set in the " "preferences." msgstr "" -"Проверьте схожесть глазами.\n" +"Проверьте соответствие визуально.\n" "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы." #: hugin1/hugin/CPEditorPanel.cpp:984 @@ -782,7 +782,7 @@ "Correlation coefficient (%.3f) is lower than the threshold set in the " "preferences." msgstr "" -"Аналогичных точек не найдено. Проверьте схожесть глазами.\n" +"Похожих точек не найдено. Проверьте соответствие визуально.\n" "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы." #: hugin1/hugin/CPEditorPanel.cpp:1013 hugin1/hugin/CPEditorPanel.cpp:1024 @@ -811,7 +811,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:1557 msgid "Cannot estimate image position without control points" -msgstr "Невозможно оценить положение изображения без контрольных точек" +msgstr "Невозможно оценить положение снимка без контрольных точек" #: hugin1/hugin/CPEditorPanel.cpp:1578 msgid "" @@ -841,11 +841,11 @@ #: hugin1/hugin/CPEditorPanel.cpp:1691 msgid "Select point in right image" -msgstr "Выберите точку в изображении справа" +msgstr "Выберите точку в снимке справа" #: hugin1/hugin/CPEditorPanel.cpp:1703 msgid "Select point in left image" -msgstr "Выберите точку в изображении слева" +msgstr "Выберите точку в снимке слева" #: hugin1/hugin/CPEditorPanel.cpp:1783 msgid "" @@ -873,7 +873,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1680 #, c-format msgid "Removed %d control points" -msgstr "Удалено контрольных точек: %d" +msgstr "Удалено %d контрольных точек " #: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/PanoOperation.cpp:781 msgid "Celeste result" @@ -881,7 +881,7 @@ #: hugin1/hugin/CPImageCtrl.cpp:348 msgid "new" -msgstr "Новая" +msgstr "новая" #: hugin1/hugin/CPImageCtrl.cpp:1250 msgid "Could not process event!" @@ -905,11 +905,11 @@ #: hugin1/hugin/CPListFrame.cpp:312 msgid "G CP#" |
From: <hug...@li...> - 2013-09-09 17:51:15
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/ee6cc0c77f19 changeset: 6291:ee6cc0c77f19 user: tmodes date: Thu May 23 18:08:52 2013 +0200 description: Added Victor Nezhelskiy to authors.txt diffstat: authors.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 92100d8e5da5 -r ee6cc0c77f19 authors.txt --- a/authors.txt Thu May 23 18:00:38 2013 +0200 +++ b/authors.txt Thu May 23 18:08:52 2013 +0200 @@ -64,6 +64,7 @@ Tiziano Müller code Vladimir Nadvornik Stereo images alignment John Navas MSI installer +Victor Nezhelskiy Russian translation José Alejandro Carrillo Neira Spanish translation Tim Nugent GSoC 2008 Celeste, GSoC 2009 Lens Calibration, GSoC 2010 mentor Simon Oosthoek Dutch translation |
From: <hug...@li...> - 2013-09-09 17:51:14
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/b542cf210f63 changeset: 6289:b542cf210f63 user: tmodes date: Thu May 23 18:09:34 2013 +0200 description: Removed now obsolete workaround This was fixed in libpano13 diffstat: src/hugin_base/panotools/PanoToolsUtils.cpp | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diffs (17 lines): diff -r 444c82671fc5 -r b542cf210f63 src/hugin_base/panotools/PanoToolsUtils.cpp --- a/src/hugin_base/panotools/PanoToolsUtils.cpp Thu May 23 18:09:12 2013 +0200 +++ b/src/hugin_base/panotools/PanoToolsUtils.cpp Thu May 23 18:09:34 2013 +0200 @@ -48,13 +48,6 @@ #include "PanoToolsInterface.h" #include "PanoToolsUtils.h" - -// missing prototype in filter.h -extern "C" { - int CheckParams( AlignInfo *g ); -} - - namespace HuginBase { namespace PTools { void calcCtrlPointErrors (PanoramaData& pano) |
From: <hug...@li...> - 2013-09-09 17:51:14
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/b11a2fc8f99b changeset: 6287:b11a2fc8f99b user: tmodes date: Thu May 23 18:00:50 2013 +0200 description: Updated Russian translation (Victor Nezhelskiy) diffstat: src/translations/ru.po | 1109 +++++++++++++++++++++++------------------------ 1 files changed, 551 insertions(+), 558 deletions(-) diffs (truncated from 3625 to 500 lines): diff -r 1473649a9fb6 -r b11a2fc8f99b src/translations/ru.po --- a/src/translations/ru.po Thu May 23 10:31:36 2013 +0200 +++ b/src/translations/ru.po Thu May 23 18:00:50 2013 +0200 @@ -8,16 +8,17 @@ "Project-Id-Version: Hugin 2011.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" -"PO-Revision-Date: 2013-01-22 11:02+0300\n" -"Last-Translator: Denis Silakov <den...@ro...>\n" +"PO-Revision-Date: 2013-05-17 10:05+0400\n" +"Last-Translator: Нежельский Виктор Андреевич <nez...@ya...>\n" "Language-Team: Russian <gno...@li...>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n" "%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.5.5\n" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 #, c-format @@ -25,8 +26,8 @@ "External program %s not found as specified in preferences, reverting to " "bundled version" msgstr "" -"Внешняя программа %s, указанная в параметрах, не была найдена. Возврат к " -"версии из поставки Hugin." +"Внешняя программа %s, указанная в параметрах, не найдена. Возврат к версии " +"из поставки Hugin." #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57 #: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82 @@ -59,15 +60,14 @@ #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" -"Внешняя программа %s не была найдена в поставке Hugin. Возврат к системному " -"пути." +"Внешняя программа %s не найдена в поставке Hugin, возврат к системному пути" #: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109 #, c-format msgid "Program %s not found in preferences, reverting to default value" msgstr "" -"Внешняя программа %s, указанная в параметрах, не была найдена. Возврат к " -"исходному значению." +"Внешняя программа %s, указанная в параметрах, не найдена, возврат к " +"исходному значению" #: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134 #: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145 @@ -149,11 +149,11 @@ #: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:368 msgid "Circular fisheye" -msgstr "Круговой «рыбий глаз»" +msgstr "Круговой РыбийГлаз" #: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:369 msgid "Full frame fisheye" -msgstr "Полнокадровый «рыбий глаз»" +msgstr "Полнокадровый РыбийГлаз" #: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:371 #: hugin1/hugin/PanoPanel.cpp:153 @@ -172,7 +172,7 @@ #: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:374 msgid "Fisheye Thoby" -msgstr "Рыбий глаз Thoby" +msgstr "РыбийГлаз Thoby" #: hugin1/base_wx/LensTools.cpp:219 msgid "Load lens parameters" @@ -187,17 +187,17 @@ "Incompatible lens parameter file, image sizes do not match\n" "Apply settings anyway?" msgstr "" -"Не поддерживаемый файл параметров объектива: \n" -"размеры изображений не совпадают\n" +"Не поддерживаемый файл параметров объектива, \n" +"размеры снимков не совпадают\n" "Всё равно применить параметры?" #: hugin1/base_wx/LensTools.cpp:242 msgid "Error loading lens parameters" -msgstr "Ошибка при загрузке параметров объектива" +msgstr "Ошибка загрузки параметров объектива" #: hugin1/base_wx/LensTools.cpp:345 hugin1/calibrate_lens/LensCalFrame.cpp:739 msgid "Save lens parameters file" -msgstr "Сохранить файл с параметрами объектива" +msgstr "Сохранить файл параметров объектива" #: hugin1/base_wx/LensTools.cpp:347 hugin1/calibrate_lens/LensCalFrame.cpp:741 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" @@ -210,17 +210,17 @@ #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160 #, c-format msgid "Failed to kill process %ld, error %d: %s" -msgstr "Не удалось убить процесс %ld, ошибка %d: %s" +msgstr "Не удалось убрать процесс %ld, ошибка %d: %s" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179 #, c-format msgid "Error pausing process %ld, code 1" -msgstr "Ошибка при паузе процесса %ld, код 1" +msgstr "Ошибка приостановки процесса %ld, код 1" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196 #, c-format msgid "Error pausing process %ld, code 2" -msgstr "Ошибка при паузе процесса %ld, код 2" +msgstr "Ошибка приостановки процесса %ld, код 2" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 #: hugin1/ptbatcher/RunStitchFrame.cpp:43 @@ -238,7 +238,7 @@ #: hugin1/base_wx/MyExternalCmdExecDialog.h:189 msgid "Command Line Progress" -msgstr "Прогресс для командной строки" +msgstr "Прогресс командной строки" #: hugin1/base_wx/MyProgressDialog.cpp:36 msgid "Elapsed time : " @@ -246,7 +246,7 @@ #: hugin1/base_wx/MyProgressDialog.h:102 msgid "Optimizing Panorama" -msgstr "Производится оптимизация панорамы" +msgstr "Оптимизация панорамы" #: hugin1/base_wx/platform.cpp:431 #, c-format @@ -255,8 +255,9 @@ "Hugin can not work with these filenames. Please rename your file(s) and try " "again." msgstr "" -"В именах файлов есть один из этих запрещённых символов: %s\n" -"Hugin не может работать с такими файлами. Переименуйте их и попробуйте снова." +"В имени файла(ов) есть один из неразрешенных символов: %s\n" +"Hugin не может работать с такими файлами. Переименуйте ваш файл(ы) и " +"попробуйте снова." #: hugin1/base_wx/platform.h:40 msgid "" @@ -266,10 +267,10 @@ "tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." "hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" msgstr "" -"Все файлы изображений|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" -"*.EXR|Файлы JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Файлы TIFF (*.tif," -"*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы HDR (*." +"Все файлы снимков|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" +"Файлы JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Файлы TIFF (*.tif,*." +"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы HDR (*." "hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Все файлы (*)|*" #: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 @@ -279,19 +280,19 @@ #: hugin1/base_wx/RunStitchPanel.cpp:141 hugin1/base_wx/RunStitchPanel.cpp:310 msgid "Could not open project file:" -msgstr "Не удалось открыть проектный файл:" +msgstr "Не удалось открыть файл проекта:" #: hugin1/base_wx/RunStitchPanel.cpp:151 hugin1/base_wx/RunStitchPanel.cpp:318 #: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:91 #, c-format msgid "could not open script : %s" -msgstr "Не удалось открыть сценарий: %s" +msgstr "не удалось открыть скрипт: %s" #: hugin1/base_wx/RunStitchPanel.cpp:172 hugin1/base_wx/RunStitchPanel.cpp:326 #: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:128 #, c-format msgid "error while parsing panotools script: %s" -msgstr "Ошибка при синтаксическом разборе сценария panotools: %s" +msgstr "ошибка при синтаксическом разборе скрипта panotools: %s" #: hugin1/base_wx/RunStitchPanel.cpp:216 hugin1/base_wx/RunStitchPanel.cpp:233 #: hugin1/base_wx/RunStitchPanel.cpp:352 @@ -313,7 +314,7 @@ #: hugin1/base_wx/RunStitchPanel.cpp:288 #, c-format msgid "Stitching %s" -msgstr "Собирается %s" +msgstr "Сшивается %s" #: hugin1/base_wx/RunStitchPanel.cpp:292 #, c-format @@ -327,7 +328,7 @@ #: hugin1/base_wx/RunStitchPanel.cpp:293 hugin1/base_wx/RunStitchPanel.cpp:299 #: hugin1/stitch_project/hugin_stitch_project.cpp:177 msgid "Error during stitching" -msgstr "Во время сборки произошла ошибка" +msgstr "Ошибка в процессе сборки" #: hugin1/base_wx/RunStitchPanel.cpp:371 #, c-format @@ -345,7 +346,7 @@ #: hugin1/base_wx/wxLensDB.cpp:233 #, c-format msgid "The input \"%s\" is not a valid number." -msgstr "Введенное \"%s\" не является числом." +msgstr "Введено \"%s\" - это недопустимое число." #: hugin1/base_wx/wxLensDB.cpp:294 translations/xrc.cpp:194 #: translations/xrc.cpp:211 translations/xrc.cpp:259 translations/xrc.cpp:826 @@ -357,7 +358,7 @@ #: hugin1/base_wx/wxLensDB.cpp:299 #, c-format msgid "%d lenses found." -msgstr "Найдено %d объективов" +msgstr "%d объективов найдено." #: hugin1/base_wx/wxLensDB.cpp:303 msgid "No lens found." @@ -368,7 +369,7 @@ "There is too little information for saving data into database. Please check " "your input!" msgstr "" -"Слишком мало информации для сохранения в базу данных. Проверьте входные " +"Слишком мало информации для сохранения в базу данных. Проверьте введенные " "данные!" #: hugin1/base_wx/wxLensDB.cpp:660 @@ -380,11 +381,11 @@ "The default folder for the database files is \"%s\".\n" "Do you want to proceed anyway?" msgstr "" -"Вы выбрали директорию \"%s\" для сохранения вашей базы данных.\n" +"Вы выбрали директорию \"%s\" для сохранения файла вашей базы данных.\n" "Эта директория не является используемой по умолчанию. Вы не сможете " "автоматически загрузить свои данных обратно в Hugin.\n" "Директория по умолчанию для файлов баз данных: \"%s\".\n" -"Действительно продолжить?" +"Хотите всеравно продолжить?" #: hugin1/base_wx/wxLensDB.cpp:708 msgid "Save lens into database file" @@ -411,18 +412,18 @@ "Could not proceed.\n" "(Error code: %d)" msgstr "" -"Выбранный объектив не соответствует информации оь этом объективе в выбранной " +"Выбранный объектив не соответствует информации об этом объективе в выбранной " "базе данных.\n" "Невозможно продолжить.\n" "(Код ошибки: %d)" #: hugin1/base_wx/wxLensDB.cpp:920 msgid "The maker field contains only an empty string." -msgstr "Поле производителя содержит только пустую строку" +msgstr "Поле производителя содержит только пустую строку." #: hugin1/base_wx/wxLensDB.cpp:925 msgid "The model field contains only an empty string." -msgstr "Поле модели содержит только пустую строку" +msgstr "Поле модели содержит только пустую строку." #: hugin1/base_wx/wxLensDB.cpp:946 msgid "Save camera into database file" @@ -431,7 +432,7 @@ #: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:192 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80 msgid "xrc directory not found in bundle" -msgstr "Каталог с файлами xrc не найден" +msgstr "xrc каталог не найден в поставке" #: hugin1/calibrate_lens/LensCalApp.cpp:66 #: hugin1/calibrate_lens/LensCalApp.cpp:74 @@ -449,12 +450,12 @@ #: hugin1/ptbatcher/PTBatcherGUI.cpp:91 #: hugin1/stitch_project/hugin_stitch_project.cpp:306 msgid "Translations not found in bundle" -msgstr "Файлы локализации не найдены" +msgstr "Файлы локализации не найдены в поставке" #: hugin1/calibrate_lens/LensCalApp.cpp:79 hugin1/hugin/huginApp.cpp:212 #: hugin1/ptbatcher/PTBatcherGUI.cpp:96 msgid "lensfun directory not found in bundle" -msgstr "Каталог lensfun не найден" +msgstr "Каталог lensfun не найден в поставке" #: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:227 #: hugin1/ptbatcher/PTBatcherGUI.cpp:119 @@ -462,12 +463,12 @@ "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" msgstr "" -"Каталог с файлами xrc не найден, Hugin не был корректно установлен.\n" -"Поиск производился здесь:" +"xrc каталог не найден, Hugin не был корректно установлен\n" +"Путь поиска:" #: hugin1/calibrate_lens/LensCalFrame.cpp:170 msgid "Hugin Lens calibration GUI" -msgstr "Интерфейс калибровки объектива" +msgstr "Hugin интерфейс калибровки объективов" #: hugin1/calibrate_lens/LensCalFrame.cpp:373 #, c-format @@ -486,10 +487,9 @@ "already added image(s).\n" "Please check the image again, if you selected the correct images." msgstr "" -"Информация EXIF из добавляемых изображений (%s) не согласуется с ранее " -"добавленными изображениями.\n" -"Пожалуйста, проверьте изображения снова, что вы выбрали правильные " -"изображения." +"Информация EXIF из добавляемых снимков (%s) не согласуется с ранее " +"добавленными.\n" +"Проверьте снимки снова, чтобы были правильные." #: hugin1/calibrate_lens/LensCalFrame.cpp:422 #: hugin1/hugin/PanoOperation.cpp:88 hugin1/hugin/wxPanoCommand.cpp:420 @@ -517,7 +517,7 @@ "Please check your inputs." msgstr "" "В полях ввода есть недопустимые значения.\n" -"Пожалуйста, проверьте введенные значения." +"Проверьте введенные значения." #: hugin1/calibrate_lens/LensCalFrame.cpp:611 msgid "Detecting edges..." @@ -525,7 +525,7 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:613 msgid "Finding lines..." -msgstr "поиск линий..." +msgstr "Поиск линий..." #: hugin1/calibrate_lens/LensCalFrame.cpp:617 #: hugin1/calibrate_lens/LensCalFrame.cpp:733 @@ -551,7 +551,7 @@ #: hugin1/hugin/MaskEditorPanel.cpp:443 #, c-format msgid "File %s exists. Overwrite?" -msgstr "Файл %s уже существует. Перезаписать его?" +msgstr "Файл %s уже существует. Перезаписать?" #: hugin1/calibrate_lens/LensCalFrame.cpp:753 #: hugin1/calibrate_lens/LensCalFrame.cpp:818 hugin1/hugin/MainFrame.cpp:873 @@ -593,7 +593,7 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:807 hugin1/hugin/MainFrame.cpp:862 msgid "Project files (*.pto)|*.pto|All files (*)|*" -msgstr "Проектные файлы (*.pto)|*.pto|Все файлы (*)|*" +msgstr "Файлы проектов (*.pto)|*.pto|Все файлы (*)|*" #: hugin1/hugin/AboutDialog.cpp:130 #, c-format @@ -602,11 +602,11 @@ #: hugin1/hugin/AboutDialog.cpp:133 msgid "64 bit" -msgstr "64 bit" +msgstr "64 битная" #: hugin1/hugin/AboutDialog.cpp:135 msgid "32 bit" -msgstr "32 bit" +msgstr "32 битная" #: hugin1/hugin/AboutDialog.cpp:136 #, c-format @@ -616,7 +616,7 @@ #: hugin1/hugin/AboutDialog.cpp:139 #, c-format msgid "Free memory: %ld kiB" -msgstr "Свободно памяти: %ld Кбайт" +msgstr "Свободная память: %ld Кбайт" #: hugin1/hugin/AboutDialog.cpp:142 #, c-format @@ -646,7 +646,7 @@ #: hugin1/hugin/AboutDialog.cpp:182 #, c-format msgid "Path to user lensfun database: %s" -msgstr "Расположение базы данных lensfun пльзователя: %s" +msgstr "Расположение базы данных lensfun пользователя: %s" #: hugin1/hugin/AboutDialog.cpp:183 msgid "Libraries" @@ -666,7 +666,7 @@ "Please check your inputs." msgstr "" "Как минимум одно поле ввода не заполнено.\n" -"Проверьте их." +"Проверьте введенные данные." #: hugin1/hugin/CPDetectorDialog.cpp:215 msgid "Try to connect all overlapping images." @@ -707,7 +707,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:145 hugin1/hugin/CPListFrame.cpp:309 #: hugin1/hugin/CPListFrame.cpp:316 msgid "Alignment" -msgstr "Объединение" +msgstr "Выравнивание" #: hugin1/hugin/CPEditorPanel.cpp:146 hugin1/hugin/CPListFrame.cpp:310 #: hugin1/hugin/CPListFrame.cpp:317 @@ -720,11 +720,11 @@ #: hugin1/hugin/CPEditorPanel.cpp:543 msgid "new control point added" -msgstr "Добавлена новая контрольная точка" +msgstr "добавлена новая контрольная точка" #: hugin1/hugin/CPEditorPanel.cpp:666 hugin1/hugin/CPEditorPanel.cpp:891 msgid "searching similar points..." -msgstr "Идёт поиск аналогичных точек..." +msgstr "поиск похожих точек..." #: hugin1/hugin/CPEditorPanel.cpp:685 hugin1/hugin/CPEditorPanel.cpp:809 msgid "Error during Fine-tune" @@ -742,11 +742,11 @@ #: hugin1/hugin/CPEditorPanel.cpp:702 hugin1/hugin/CPEditorPanel.cpp:832 msgid "change points, or press right mouse button to add the pair" -msgstr "Смените точки, либо нажмите правую клавишу мыши, чтобы добавить пару" +msgstr "смените точки, либо нажмите правую кнопку мыши, чтобы добавить пару" #: hugin1/hugin/CPEditorPanel.cpp:722 msgid "Estimated point outside image" -msgstr "Расчётная точка вне изображения" +msgstr "Расчётная точка вне снимка" #: hugin1/hugin/CPEditorPanel.cpp:972 msgid "No similar point found." @@ -772,7 +772,7 @@ "Correlation coefficient (%.3f) is lower than the threshold set in the " "preferences." msgstr "" -"Проверьте схожесть глазами.\n" +"Проверьте соответствие визуально.\n" "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы." #: hugin1/hugin/CPEditorPanel.cpp:984 @@ -782,7 +782,7 @@ "Correlation coefficient (%.3f) is lower than the threshold set in the " "preferences." msgstr "" -"Аналогичных точек не найдено. Проверьте схожесть глазами.\n" +"Похожих точек не найдено. Проверьте соответствие визуально.\n" "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы." #: hugin1/hugin/CPEditorPanel.cpp:1013 hugin1/hugin/CPEditorPanel.cpp:1024 @@ -811,7 +811,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:1557 msgid "Cannot estimate image position without control points" -msgstr "Невозможно оценить положение изображения без контрольных точек" +msgstr "Невозможно оценить положение снимка без контрольных точек" #: hugin1/hugin/CPEditorPanel.cpp:1578 msgid "" @@ -841,11 +841,11 @@ #: hugin1/hugin/CPEditorPanel.cpp:1691 msgid "Select point in right image" -msgstr "Выберите точку в изображении справа" +msgstr "Выберите точку в снимке справа" #: hugin1/hugin/CPEditorPanel.cpp:1703 msgid "Select point in left image" -msgstr "Выберите точку в изображении слева" +msgstr "Выберите точку в снимке слева" #: hugin1/hugin/CPEditorPanel.cpp:1783 msgid "" @@ -873,7 +873,7 @@ #: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1680 #, c-format msgid "Removed %d control points" -msgstr "Удалено контрольных точек: %d" +msgstr "Удалено %d контрольных точек " #: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/PanoOperation.cpp:781 msgid "Celeste result" @@ -881,7 +881,7 @@ #: hugin1/hugin/CPImageCtrl.cpp:348 msgid "new" -msgstr "Новая" +msgstr "новая" #: hugin1/hugin/CPImageCtrl.cpp:1250 msgid "Could not process event!" @@ -905,11 +905,11 @@ #: hugin1/hugin/CPListFrame.cpp:312 msgid "G CP#" |
From: <hug...@li...> - 2013-09-09 17:51:13
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/444c82671fc5 changeset: 6288:444c82671fc5 user: tmodes date: Thu May 23 18:09:12 2013 +0200 description: Added Victor Nezhelskiy to authors.txt diffstat: authors.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b11a2fc8f99b -r 444c82671fc5 authors.txt --- a/authors.txt Thu May 23 18:00:50 2013 +0200 +++ b/authors.txt Thu May 23 18:09:12 2013 +0200 @@ -64,6 +64,7 @@ Tiziano Müller code Vladimir Nadvornik Stereo images alignment John Navas MSI installer +Victor Nezhelskiy Russian translation José Alejandro Carrillo Neira Spanish translation Tim Nugent GSoC 2008 Celeste, GSoC 2009 Lens Calibration, GSoC 2010 mentor Simon Oosthoek Dutch translation |
From: <hug...@li...> - 2013-09-09 17:51:12
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/1473649a9fb6 changeset: 6286:1473649a9fb6 user: Kornel Benko <kor...@us...> date: Thu May 23 10:31:36 2013 +0200 description: * sk.po diffstat: src/translations/sk.po | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diffs (41 lines): diff -r 57bc753b4f9d -r 1473649a9fb6 src/translations/sk.po --- a/src/translations/sk.po Wed May 22 23:38:32 2013 +0200 +++ b/src/translations/sk.po Thu May 23 10:31:36 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: hugin\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2013-05-04 18:29+0200\n" +"POT-Creation-Date: 2013-05-23 10:23+0200\n" "PO-Revision-Date: 2013-03-24 18:40+0100\n" "Last-Translator: Kornel Benko <ko...@ly...>\n" "Language-Team: Slovak <sk...@li...>\n" @@ -3069,6 +3069,16 @@ msgid "Error during Stitching" msgstr "Chyba počas lepenia" +#: hugin1/hugin/huginApp.cpp:205 +#, c-format +msgid "Directory '%s' does not exists" +msgstr "Adresár '%s' neexistuje" + +# Nepodarilo sa nastaviť premennú prostredia PYTHONHOME +#: hugin1/hugin/huginApp.cpp:209 +msgid "Could not set environment variable PYTHONHOME" +msgstr "Could not set environment variable PYTHONHOME" + #: hugin1/hugin/wxPanoCommand.cpp:200 #, c-format msgid "" @@ -5752,9 +5762,9 @@ "Generovať plne zmiešanú panorámu pre každú expozíciu. Užitočné pri ručnom " "miešaní kontrastu v grafickom editore." -#: translations/xrc.cpp:601 xrc.cpp:601 +#: hugin1/hugin/xrc/pano_panel.xrc:716 msgid "Processing:" -msgstr "Spracovávam:" +msgstr "Spracovanie:" #: translations/xrc.cpp:602 xrc.cpp:602 msgid "Remapper:" |
From: <hug...@li...> - 2013-09-09 17:51:11
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/57bc753b4f9d changeset: 6285:57bc753b4f9d user: ___matthieu___ <mat...@gm...> date: Wed May 22 23:38:32 2013 +0200 description: [MacOSX] Added Xcode4 projects and an Xcode workspace for building with Xcode4 diffstat: mac/Applications.xcodeproj/project.pbxproj | 3347 +++++++++ mac/Applications.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 + mac/Applications.xcodeproj/xcshareddata/xcschemes/Applications.xcscheme | 137 + mac/Applications.xcodeproj/xcshareddata/xcschemes/DMG.xcscheme | 77 + mac/Hugin.xcworkspace/contents.xcworkspacedata | 13 + mac/Hugin.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings | 8 + mac/Libraries.xcodeproj/project.pbxproj | 3673 ++++++++++ mac/Libraries.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 + mac/Libraries.xcodeproj/xcshareddata/xcschemes/Libraries.xcscheme | 283 + mac/README.xcode.txt | 12 + mac/Tools.xcodeproj/project.pbxproj | 3314 +++++++++ mac/Tools.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 + mac/Tools.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme | 408 + mac/Version.xcconfig | 2 +- mac/localised.sh | 5 +- mac/xcode4-scripts/BuildConfig.xcconfig.template | 113 + mac/xcode4-scripts/CalibrateLensGUI-Info.plist | 47 + mac/xcode4-scripts/bundle-python.sh | 86 + mac/xcode4-scripts/complete-bundle.sh | 109 + src/hugin1/base_wx/platform.cpp | 43 +- src/hugin1/base_wx/platform.h | 1 + src/hugin1/hugin/huginApp.cpp | 17 + src/hugin_script_interface/hpi_classes.h | 6 +- 23 files changed, 11715 insertions(+), 7 deletions(-) diffs (truncated from 11878 to 500 lines): diff -r cf2052881569 -r 57bc753b4f9d mac/Applications.xcodeproj/project.pbxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/Applications.xcodeproj/project.pbxproj Wed May 22 23:38:32 2013 +0200 @@ -0,0 +1,3347 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXAggregateTarget section */ + 43D371BC17096E5F00B3B844 /* Tools */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 43D371BD17096E5F00B3B844 /* Build configuration list for PBXAggregateTarget "Tools" */; + buildPhases = ( + ); + dependencies = ( + 43D3725E1709954700B3B844 /* PBXTargetDependency */, + 43D371C117096E6D00B3B844 /* PBXTargetDependency */, + 43D371C317096E6D00B3B844 /* PBXTargetDependency */, + 43D371C717096E6D00B3B844 /* PBXTargetDependency */, + 43D371C917096E6D00B3B844 /* PBXTargetDependency */, + 43D371CB17096E6D00B3B844 /* PBXTargetDependency */, + 43D371CD17096E6D00B3B844 /* PBXTargetDependency */, + 43D371CF17096E6D00B3B844 /* PBXTargetDependency */, + 43D371D117096E6D00B3B844 /* PBXTargetDependency */, + 43D371D317096E6D00B3B844 /* PBXTargetDependency */, + 43D371D517096E6D00B3B844 /* PBXTargetDependency */, + 43D371D717096E6D00B3B844 /* PBXTargetDependency */, + 43D371D917096E6D00B3B844 /* PBXTargetDependency */, + 43D371DB17096E6D00B3B844 /* PBXTargetDependency */, + 43D371DD17096E6D00B3B844 /* PBXTargetDependency */, + 43D371DF17096E6D00B3B844 /* PBXTargetDependency */, + 43D371E117096E6D00B3B844 /* PBXTargetDependency */, + 43D371E317096E6D00B3B844 /* PBXTargetDependency */, + 43D371E517096E6D00B3B844 /* PBXTargetDependency */, + 43D371E717096E6D00B3B844 /* PBXTargetDependency */, + 43D371E917096E6D00B3B844 /* PBXTargetDependency */, + 43D371EB17096E6D00B3B844 /* PBXTargetDependency */, + 43D371ED17096E6D00B3B844 /* PBXTargetDependency */, + 43D371EF17096E6D00B3B844 /* PBXTargetDependency */, + ); + name = Tools; + productName = Tools; + }; + 43D371F017096E7D00B3B844 /* Bundle */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 43D371F117096E7D00B3B844 /* Build configuration list for PBXAggregateTarget "Bundle" */; + buildPhases = ( + 43D3720017096EC300B3B844 /* Run Script - Remove Installer folder */, + 43D3720217096EF800B3B844 /* CopyFiles */, + 43A22BCA170CCD2600D5A7CC /* Run Script - Link HuginStitchProject.app Libraries in Hugin.app */, + 43D3720617096F2400B3B844 /* Run Script - Create stripped apps for installer */, + 43D3720717096F5400B3B844 /* Run Script - Create HuginTools folder with symlinks */, + ); + dependencies = ( + 43D371F517096E8900B3B844 /* PBXTargetDependency */, + 43D371F717096E8900B3B844 /* PBXTargetDependency */, + 43D371FB17096E8900B3B844 /* PBXTargetDependency */, + 43D371FD17096E8900B3B844 /* PBXTargetDependency */, + 43D371FF17096E8900B3B844 /* PBXTargetDependency */, + ); + name = Bundle; + productName = Bundle; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 430A82E01715E87300AA0BD9 /* _hsi.so in Copy Files - Python Modules */ = {isa = PBXBuildFile; fileRef = 43D3718217079EC400B3B844 /* _hsi.so */; }; + 430A82E51715E89400AA0BD9 /* hpi.py in Copy Files - Python Modules */ = {isa = PBXBuildFile; fileRef = 430A82E31715E88E00AA0BD9 /* hpi.py */; }; + 430A82E61715E89400AA0BD9 /* hsi.py in Copy Files - Python Modules */ = {isa = PBXBuildFile; fileRef = 430A82E41715E88E00AA0BD9 /* hsi.py */; }; + 430A82E71716081100AA0BD9 /* libhpi-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43353479171388F200889E02 /* libhpi-2013.0.dylib */; }; + 43352ED11713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED21713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 43352ED31713523C00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED41713524100889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 43352ED51713524A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED61713525100889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 43352ED71713525B00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED81713526000889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 433534A517138FFD00889E02 /* libhpi-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43353479171388F200889E02 /* libhpi-2013.0.dylib */; }; + 433534D21714B69E00889E02 /* crop_cp.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534CC1714B67700889E02 /* crop_cp.py */; }; + 433534D31714B69E00889E02 /* shooting_pattern.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534CE1714B67700889E02 /* shooting_pattern.py */; }; + 433534D41714B69E00889E02 /* top_five.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534CF1714B67700889E02 /* top_five.py */; }; + 433534D51714B69E00889E02 /* woa.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534D01714B67700889E02 /* woa.py */; }; + 43760F3A170748D300ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43760F3E1707491100ED2679 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F3D1707491100ED2679 /* Carbon.framework */; }; + 43760F5C17074E5800ED2679 /* LensCalApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5417074E5800ED2679 /* LensCalApp.cpp */; }; + 43760F5D17074E5800ED2679 /* LensCalFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5617074E5800ED2679 /* LensCalFrame.cpp */; }; + 43760F5E17074E5800ED2679 /* LensCalImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5817074E5800ED2679 /* LensCalImageCtrl.cpp */; }; + 43760F5F17074E5800ED2679 /* LensCalTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5A17074E5800ED2679 /* LensCalTypes.cpp */; }; + 43760F6617074E7300ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43760F6717074E7300ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43760F6817074E7300ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43760F6B17074FF900ED2679 /* liblines-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DE17057D5500D165A4 /* liblines-2013.0.dylib */; }; + 43760F711707506F00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F5117074D6500ED2679 /* libpano13.2.dylib */; }; + 43760F721707506F00ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43760F741707508F00ED2679 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F731707508F00ED2679 /* CoreFoundation.framework */; }; + 43760F861707514400ED2679 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F761707514400ED2679 /* Batch.cpp */; }; + 43760F871707514400ED2679 /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F781707514400ED2679 /* BatchFrame.cpp */; }; + 43760F881707514400ED2679 /* BatchTrayIcon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F7A1707514400ED2679 /* BatchTrayIcon.cpp */; }; + 43760F891707514400ED2679 /* FailedProjectsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F7C1707514400ED2679 /* FailedProjectsDialog.cpp */; }; + 43760F8A1707514400ED2679 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F7E1707514400ED2679 /* ProjectArray.cpp */; }; + 43760F8B1707514400ED2679 /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F801707514400ED2679 /* ProjectListBox.cpp */; }; + 43760F8C1707514400ED2679 /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F821707514400ED2679 /* PTBatcherGUI.cpp */; }; + 43760F8D1707514400ED2679 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F841707514400ED2679 /* RunStitchFrame.cpp */; }; + 43760F941707515A00ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43760F951707515A00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43760F961707515A00ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43760F99170751F900ED2679 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F731707508F00ED2679 /* CoreFoundation.framework */; }; + 43760F9A1707520A00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F5117074D6500ED2679 /* libpano13.2.dylib */; }; + 43760F9E1707528B00ED2679 /* FindPanoDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F9C1707528B00ED2679 /* FindPanoDialog.cpp */; }; + 43760F9F170752F700ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43761020170753AA00ED2679 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA1170753AA00ED2679 /* AboutDialog.cpp */; }; + 43761021170753AA00ED2679 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA3170753AA00ED2679 /* ChoosyRemapper.cpp */; }; + 43761022170753AA00ED2679 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA5170753AA00ED2679 /* CommandHistory.cpp */; }; + 43761023170753AA00ED2679 /* CPDetectorDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA8170753AA00ED2679 /* CPDetectorDialog.cpp */; }; + 43761024170753AA00ED2679 /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FAA170753AA00ED2679 /* CPEditorPanel.cpp */; }; + 43761025170753AA00ED2679 /* CPImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FAC170753AA00ED2679 /* CPImageCtrl.cpp */; }; + 43761026170753AA00ED2679 /* CPImagesComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FAE170753AA00ED2679 /* CPImagesComboBox.cpp */; }; + 43761027170753AA00ED2679 /* CPListFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB0170753AA00ED2679 /* CPListFrame.cpp */; }; + 43761028170753AA00ED2679 /* DragTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB2170753AA00ED2679 /* DragTool.cpp */; }; + 43761029170753AA00ED2679 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB4170753AA00ED2679 /* GLPreviewFrame.cpp */; }; + 4376102A170753AA00ED2679 /* GLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB6170753AA00ED2679 /* GLRenderer.cpp */; }; + 4376102B170753AA00ED2679 /* GLViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB8170753AA00ED2679 /* GLViewer.cpp */; }; + 4376102C170753AA00ED2679 /* GreatCircles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FBA170753AA00ED2679 /* GreatCircles.cpp */; }; + 4376102D170753AA00ED2679 /* GuiLevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FBC170753AA00ED2679 /* GuiLevel.cpp */; }; + 4376102E170753AA00ED2679 /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FBE170753AA00ED2679 /* HDRMergeOptionDialog.cpp */; }; + 4376102F170753AA00ED2679 /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC0170753AA00ED2679 /* HFOVDialog.cpp */; }; + 43761030170753AA00ED2679 /* HtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC2170753AA00ED2679 /* HtmlWindow.cpp */; }; + 43761031170753AA00ED2679 /* huginApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC4170753AA00ED2679 /* huginApp.cpp */; }; + 43761032170753AA00ED2679 /* ImagesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC6170753AA00ED2679 /* ImagesList.cpp */; }; + 43761033170753AA00ED2679 /* ImagesPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC8170753AA00ED2679 /* ImagesPanel.cpp */; }; + 43761034170753AA00ED2679 /* ImagesTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FCA170753AA00ED2679 /* ImagesTree.cpp */; }; + 43761035170753AA00ED2679 /* ImageVariableDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FCC170753AA00ED2679 /* ImageVariableDialog.cpp */; }; + 43761036170753AA00ED2679 /* LayoutRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FCE170753AA00ED2679 /* LayoutRemapper.cpp */; }; + 43761037170753AA00ED2679 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD0170753AA00ED2679 /* LocalizedFileTipProvider.cpp */; }; + 43761038170753AA00ED2679 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD2170753AA00ED2679 /* MainFrame.cpp */; }; + 43761039170753AA00ED2679 /* MaskEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD4170753AA00ED2679 /* MaskEditorPanel.cpp */; }; + 4376103A170753AA00ED2679 /* MaskImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD6170753AA00ED2679 /* MaskImageCtrl.cpp */; }; + 4376103B170753AA00ED2679 /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD8170753AA00ED2679 /* MaskLoadDialog.cpp */; }; + 4376103C170753AA00ED2679 /* MeshManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FDA170753AA00ED2679 /* MeshManager.cpp */; }; + 4376103D170753AA00ED2679 /* MeshRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FDC170753AA00ED2679 /* MeshRemapper.cpp */; }; + 4376103E170753AA00ED2679 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FDE170753AA00ED2679 /* NonaOptionsDialog.cpp */; }; + 4376103F170753AA00ED2679 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE0170753AA00ED2679 /* OptimizePanel.cpp */; }; + 43761040170753AA00ED2679 /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE2170753AA00ED2679 /* OptimizePhotometricPanel.cpp */; }; + 43761041170753AA00ED2679 /* OutputProjectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE4170753AA00ED2679 /* OutputProjectionInfo.cpp */; }; + 43761042170753AA00ED2679 /* OverviewCameraTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE6170753AA00ED2679 /* OverviewCameraTool.cpp */; }; + 43761043170753AA00ED2679 /* OverviewOutlinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE8170753AA00ED2679 /* OverviewOutlinesTool.cpp */; }; + 43761044170753AA00ED2679 /* PanoOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FEA170753AA00ED2679 /* PanoOperation.cpp */; }; + 43761045170753AA00ED2679 /* PanoOutputDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FEC170753AA00ED2679 /* PanoOutputDialog.cpp */; }; + 43761046170753AA00ED2679 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FEE170753AA00ED2679 /* PanoPanel.cpp */; }; + 43761047170753AA00ED2679 /* PanosphereSphereTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF0170753AA00ED2679 /* PanosphereSphereTool.cpp */; }; + 43761048170753AA00ED2679 /* PluginItems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF2170753AA00ED2679 /* PluginItems.cpp */; }; + 43761049170753AA00ED2679 /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF4170753AA00ED2679 /* PreferencesDialog.cpp */; }; + 4376104A170753AA00ED2679 /* PreviewColorPickerTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF6170753AA00ED2679 /* PreviewColorPickerTool.cpp */; }; + 4376104B170753AA00ED2679 /* PreviewControlPointTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF8170753AA00ED2679 /* PreviewControlPointTool.cpp */; }; + 4376104C170753AA00ED2679 /* PreviewCropTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FFA170753AA00ED2679 /* PreviewCropTool.cpp */; }; + 4376104D170753AA00ED2679 /* PreviewDifferenceTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FFC170753AA00ED2679 /* PreviewDifferenceTool.cpp */; }; + 4376104E170753AA00ED2679 /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FFE170753AA00ED2679 /* PreviewFrame.cpp */; }; + 4376104F170753AA00ED2679 /* PreviewGuideTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761000170753AA00ED2679 /* PreviewGuideTool.cpp */; }; + 43761050170753AA00ED2679 /* PreviewIdentifyTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761002170753AA00ED2679 /* PreviewIdentifyTool.cpp */; }; + 43761051170753AA00ED2679 /* PreviewLayoutLinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761004170753AA00ED2679 /* PreviewLayoutLinesTool.cpp */; }; + 43761052170753AA00ED2679 /* PreviewPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761006170753AA00ED2679 /* PreviewPanel.cpp */; }; + 43761053170753AA00ED2679 /* PreviewPanoMaskTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761008170753AA00ED2679 /* PreviewPanoMaskTool.cpp */; }; + 43761054170753AA00ED2679 /* ProjectionGridTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376100A170753AA00ED2679 /* ProjectionGridTool.cpp */; }; + 43761055170753AA00ED2679 /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376100C170753AA00ED2679 /* ResetDialog.cpp */; }; + 43761056170753AA00ED2679 /* TexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376100E170753AA00ED2679 /* TexCoordRemapper.cpp */; }; + 43761057170753AA00ED2679 /* TextKillFocusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761010170753AA00ED2679 /* TextKillFocusHandler.cpp */; }; + 43761058170753AA00ED2679 /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761012170753AA00ED2679 /* TextureManager.cpp */; }; + 43761059170753AA00ED2679 /* Tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761014170753AA00ED2679 /* Tool.cpp */; }; + 4376105A170753AA00ED2679 /* ToolHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761016170753AA00ED2679 /* ToolHelper.cpp */; }; + 4376105B170753AA00ED2679 /* treelistctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761018170753AA00ED2679 /* treelistctrl.cpp */; }; + 4376105C170753AA00ED2679 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376101A170753AA00ED2679 /* VertexCoordRemapper.cpp */; }; + 4376105D170753AA00ED2679 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376101C170753AA00ED2679 /* ViewState.cpp */; }; + 4376105E170753AA00ED2679 /* wxPanoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376101E170753AA00ED2679 /* wxPanoCommand.cpp */; }; + 43761065170753F400ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43761066170753F400ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43761067170753F400ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43A22BC2170B938E00D5A7CC /* liblensdb-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D817057D5500D165A4 /* liblensdb-2013.0.dylib */; }; + 43A22BC3170B938E00D5A7CC /* liblines-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DE17057D5500D165A4 /* liblines-2013.0.dylib */; }; + 43A22BC4170B938E00D5A7CC /* liblocalfeatures-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E217057D5500D165A4 /* liblocalfeatures-2013.0.dylib */; }; + 43A22BC5170B938E00D5A7CC /* libflann-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E417057D5500D165A4 /* libflann-2013.0.dylib */; }; + 43BA38B617058F7A00D165A4 /* hugin_stitch_project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA38B517058F7A00D165A4 /* hugin_stitch_project.cpp */; }; + 43BA38B717058F9500D165A4 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43BA38B817058F9500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43BA38B917058F9500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D3712F170781FE00B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D371531707821E00B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D371541707823900B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D371561707824900B3B844 /* libboost_thread-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371551707824900B3B844 /* libboost_thread-1_46.dylib */; }; + 43D371571707930400B3B844 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F731707508F00ED2679 /* CoreFoundation.framework */; }; + 43D37158170793AF00B3B844 /* libceleste-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E017057D5500D165A4 /* libceleste-2013.0.dylib */; }; + 43D3715D170793FB00B3B844 /* libmakefile-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D3715E1707943900B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D3715F1707943900B3B844 /* libboost_thread-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371551707824900B3B844 /* libboost_thread-1_46.dylib */; }; + 43D371611707943900B3B844 /* libboost_signals-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371601707943900B3B844 /* libboost_signals-1_46.dylib */; }; + 43D371631707946000B3B844 /* libGLEW.1.9.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371621707946000B3B844 /* libGLEW.1.9.0.dylib */; }; + 43D371651707947600B3B844 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371641707947600B3B844 /* OpenGL.framework */; }; + 43D371661707949B00B3B844 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F5117074D6500ED2679 /* libpano13.2.dylib */; }; + 43D37168170794AE00B3B844 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D37167170794AD00B3B844 /* GLUT.framework */; }; + 43D371691707956000B3B844 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43D3716B1707956000B3B844 /* libexiv2.12.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3716A1707956000B3B844 /* libexiv2.12.dylib */; }; + 43D3716C1707960800B3B844 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F3D1707491100ED2679 /* Carbon.framework */; }; + 43D3716D170796B400B3B844 /* libicpfind-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E817057D5500D165A4 /* libicpfind-2013.0.dylib */; }; + 43D371881707A4CC00B3B844 /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 43D371841707A03A00B3B844 /* Hugin.icns */; }; + 43D371891707A4CC00B3B844 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 43D371851707A03A00B3B844 /* HuginFiles.icns */; }; + 43D371AC17082CCC00B3B844 /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 43BA375117057C3500D165A4 /* HuginStitchProject.app */; }; + 43D371B41708DB4100B3B844 /* libhugin_vigra_impex-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D371B51708DB4100B3B844 /* libhugin_base-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43D371B61708DB4100B3B844 /* libceleste-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E017057D5500D165A4 /* libceleste-2013.0.dylib */; }; + 43D371B71708DB4100B3B844 /* libbase_wx-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43D371B81708DB4100B3B844 /* libicpfind-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E817057D5500D165A4 /* libicpfind-2013.0.dylib */; }; + 43D371B91708DB8900B3B844 /* libmakefile-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D371BA1708DE6400B3B844 /* liblevmar-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D617057D5500D165A4 /* liblevmar-2013.0.dylib */; }; + 43D371BB1708E1E600B3B844 /* PTBatcherGui.icns in Resources */ = {isa = PBXBuildFile; fileRef = 43D371861707A03A00B3B844 /* PTBatcherGui.icns */; }; + 43D3720317096F1200B3B844 /* Hugin.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BA373017057B4100D165A4 /* Hugin.app */; }; + 43D3720417096F1200B3B844 /* PTBatcherGUI.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BA378717057C5100D165A4 /* PTBatcherGUI.app */; }; + 43D3720517096F1200B3B844 /* CalibrateLensGUI.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BA37A217057C6300D165A4 /* CalibrateLensGUI.app */; }; + 43D3723117097E4700B3B844 /* libhugin_vigra_impex-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D3723217097E4700B3B844 /* liblevmar-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D617057D5500D165A4 /* liblevmar-2013.0.dylib */; }; + 43D3723317097E4700B3B844 /* libhugin_base-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43D3723417097E4700B3B844 /* libbase_wx-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43D372361709800300B3B844 /* libhugin_vigra_impex-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D372371709800300B3B844 /* libhugin_base-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43D372381709800300B3B844 /* liblines-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DE17057D5500D165A4 /* liblines-2013.0.dylib */; }; + 43D372391709800300B3B844 /* libbase_wx-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43D3723A1709801000B3B844 /* libmakefile-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D372401709836000B3B844 /* libmakefile-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D372411709853500B3B844 /* liblevmar-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D617057D5500D165A4 /* liblevmar-2013.0.dylib */; }; + 43E38DFA173780AA00436356 /* Python27.framework in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43E38DF9173780AA00436356 /* Python27.framework */; }; + 43E88A70170F84BF00B35E48 /* align_image_stack in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA37FF17057D5500D165A4 /* align_image_stack */; }; + 43E88A71170F84BF00B35E48 /* autooptimiser in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380117057D5500D165A4 /* autooptimiser */; }; + 43E88A72170F84BF00B35E48 /* cpclean in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380717057D5500D165A4 /* cpclean */; }; + 43E88A73170F84BF00B35E48 /* checkpto in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380517057D5500D165A4 /* checkpto */; }; + 43E88A74170F84BF00B35E48 /* cpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380917057D5500D165A4 /* cpfind */; }; + 43E88A75170F84BF00B35E48 /* fulla in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380B17057D5500D165A4 /* fulla */; }; + 43E88A76170F84BF00B35E48 /* hugin_hdrmerge in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380D17057D5500D165A4 /* hugin_hdrmerge */; }; + 43E88A77170F84BF00B35E48 /* icpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380F17057D5500D165A4 /* icpfind */; }; + 43E88A78170F84BF00B35E48 /* linefind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381117057D5500D165A4 /* linefind */; }; + 43E88A79170F84BF00B35E48 /* nona in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381317057D5500D165A4 /* nona */; }; + 43E88A7A170F84BF00B35E48 /* pano_trafo in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381517057D5500D165A4 /* pano_trafo */; }; + 43E88A7B170F84BF00B35E48 /* pano_modify in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381717057D5500D165A4 /* pano_modify */; }; + 43E88A7C170F84BF00B35E48 /* pto2mk in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381917057D5500D165A4 /* pto2mk */; }; + 43E88A7D170F84BF00B35E48 /* pto_merge in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381B17057D5500D165A4 /* pto_merge */; }; + 43E88A7E170F84BF00B35E48 /* pto_gen in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381D17057D5500D165A4 /* pto_gen */; }; + 43E88A7F170F84BF00B35E48 /* tca_correct in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381F17057D5500D165A4 /* tca_correct */; }; + 43E88A80170F84BF00B35E48 /* deghosting_mask in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382117057D5500D165A4 /* deghosting_mask */; }; + 43E88A81170F84BF00B35E48 /* matchpoint in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382317057D5500D165A4 /* matchpoint */; }; + 43E88A82170F84BF00B35E48 /* PTBatcher in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382517057D5500D165A4 /* PTBatcher */; }; + 43E88A83170F84BF00B35E48 /* vig_optimize in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382717057D5500D165A4 /* vig_optimize */; }; + 43E88A84170F84BF00B35E48 /* geocpset in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43760E931706517500ED2679 /* geocpset */; }; + 43E88A85170F84BF00B35E48 /* pto_var in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43760E951706517500ED2679 /* pto_var */; }; + 43E88A86170F84BF00B35E48 /* pto_lensstack in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43760E971706517500ED2679 /* pto_lensstack */; }; + 43E88A87170F84BF00B35E48 /* celeste_standalone in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43D372611709954800B3B844 /* celeste_standalone */; }; + 43E88A8B170F85B600B35E48 /* align_image_stack in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA37FF17057D5500D165A4 /* align_image_stack */; }; + 43E88A8C170F85B600B35E48 /* cpclean in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380717057D5500D165A4 /* cpclean */; }; + 43E88A8D170F85B600B35E48 /* checkpto in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380517057D5500D165A4 /* checkpto */; }; + 43E88A8E170F85B600B35E48 /* cpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380917057D5500D165A4 /* cpfind */; }; + 43E88A8F170F85B600B35E48 /* hugin_hdrmerge in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380D17057D5500D165A4 /* hugin_hdrmerge */; }; + 43E88A90170F85B600B35E48 /* icpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380F17057D5500D165A4 /* icpfind */; }; + 43E88A91170F85B600B35E48 /* linefind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381117057D5500D165A4 /* linefind */; }; + 43E88A92170F85B600B35E48 /* nona in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381317057D5500D165A4 /* nona */; }; + 43E88A93170F85B600B35E48 /* pano_modify in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381717057D5500D165A4 /* pano_modify */; }; + 43E88A94170F85B600B35E48 /* celeste_standalone in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43D372611709954800B3B844 /* celeste_standalone */; }; + 43E88A95170F85C000B35E48 /* autooptimiser in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380117057D5500D165A4 /* autooptimiser */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 430A82EB1716122600AA0BD9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43D3717817079DD100B3B844; + remoteInfo = hsi; + }; + 43353478171388F200889E02 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 433534601713868B00889E02; + remoteInfo = hpi; + }; + 4335349717138FE600889E02 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 4335345F1713868B00889E02; + remoteInfo = hpi; + }; + 43760E921706517500ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43760E4117064FC400ED2679; + remoteInfo = geocpset; + }; + 43760E941706517500ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43760E551706500C00ED2679; + remoteInfo = pto_var; + }; + 43760E961706517500ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43760E641706504700ED2679; + remoteInfo = pto_lensstack; + }; + 43760F6017074E6600ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA31B61702E7D500D165A4; + remoteInfo = hugin_vigra_impex; + }; + 43760F6217074E6600ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA32701703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43760F6417074E6600ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA35271704F90600D165A4; + remoteInfo = base_wx; + }; + 43760F6C17074FFD00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA34281704354300D165A4; + remoteInfo = lines; + }; + 43760F8E1707515200ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA31B61702E7D500D165A4; + remoteInfo = hugin_vigra_impex; + }; + 43760F901707515200ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA32701703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43760F921707515200ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA35271704F90600D165A4; + remoteInfo = base_wx; + }; + 4376105F170753EC00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA31B61702E7D500D165A4; + remoteInfo = hugin_vigra_impex; + }; + 43761061170753EC00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA32701703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43761063170753EC00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA35271704F90600D165A4; + remoteInfo = base_wx; + }; + 43A22C0F170E259900D5A7CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43A22BD2170E21B700D5A7CC; + remoteInfo = zthread; + }; + 43BA37D317057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA31B71702E7D500D165A4; + remoteInfo = vigra_impex; + }; + 43BA37D517057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA32301703A4F200D165A4; + remoteInfo = levmar; + }; + 43BA37D717057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA325C1703A5BE00D165A4; + remoteInfo = lensdb; + }; + 43BA37D917057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA32711703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43BA37DB17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA327A1703AED500D165A4; + remoteInfo = makefile; + }; + 43BA37DD17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA34291704354300D165A4; + remoteInfo = lines; + }; + 43BA37DF17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA344D1704ED3000D165A4; + remoteInfo = celeste; + }; + 43BA37E117057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA349D1704F59500D165A4; + remoteInfo = localfeatures; + }; + 43BA37E317057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA34D51704F65E00D165A4; + remoteInfo = flann; + }; + 43BA37E517057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35281704F90600D165A4; + remoteInfo = base_wx; + }; + 43BA37E717057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA36E81705750400D165A4; + remoteInfo = icpfind; + }; + 43BA37FE17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA355E170506D100D165A4; + remoteInfo = align_image_stack; + }; + 43BA380017057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA359E17056FC300D165A4; + remoteInfo = autooptimiser; + }; + 43BA380417057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35DB1705718500D165A4; + remoteInfo = checkpto; + }; + 43BA380617057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35CE1705717500D165A4; + remoteInfo = cpclean; + }; + 43BA380817057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35E81705719100D165A4; |
From: <hug...@li...> - 2013-09-09 17:51:11
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/636261f9cecf changeset: 6284:636261f9cecf user: ___matthieu___ <mat...@gm...> date: Wed May 22 23:38:32 2013 +0200 description: [MacOSX] Added Xcode4 projects and an Xcode workspace for building with Xcode4 diffstat: mac/Applications.xcodeproj/project.pbxproj | 3347 +++++++++ mac/Applications.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 + mac/Applications.xcodeproj/xcshareddata/xcschemes/Applications.xcscheme | 137 + mac/Applications.xcodeproj/xcshareddata/xcschemes/DMG.xcscheme | 77 + mac/Hugin.xcworkspace/contents.xcworkspacedata | 13 + mac/Hugin.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings | 8 + mac/Libraries.xcodeproj/project.pbxproj | 3673 ++++++++++ mac/Libraries.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 + mac/Libraries.xcodeproj/xcshareddata/xcschemes/Libraries.xcscheme | 283 + mac/README.xcode.txt | 12 + mac/Tools.xcodeproj/project.pbxproj | 3314 +++++++++ mac/Tools.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 + mac/Tools.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme | 408 + mac/Version.xcconfig | 2 +- mac/localised.sh | 5 +- mac/xcode4-scripts/BuildConfig.xcconfig.template | 113 + mac/xcode4-scripts/CalibrateLensGUI-Info.plist | 47 + mac/xcode4-scripts/bundle-python.sh | 86 + mac/xcode4-scripts/complete-bundle.sh | 109 + src/hugin1/base_wx/platform.cpp | 43 +- src/hugin1/base_wx/platform.h | 1 + src/hugin1/hugin/huginApp.cpp | 17 + src/hugin_script_interface/hpi_classes.h | 6 +- 23 files changed, 11715 insertions(+), 7 deletions(-) diffs (truncated from 11878 to 500 lines): diff -r a9991501efd8 -r 636261f9cecf mac/Applications.xcodeproj/project.pbxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/Applications.xcodeproj/project.pbxproj Wed May 22 23:38:32 2013 +0200 @@ -0,0 +1,3347 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXAggregateTarget section */ + 43D371BC17096E5F00B3B844 /* Tools */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 43D371BD17096E5F00B3B844 /* Build configuration list for PBXAggregateTarget "Tools" */; + buildPhases = ( + ); + dependencies = ( + 43D3725E1709954700B3B844 /* PBXTargetDependency */, + 43D371C117096E6D00B3B844 /* PBXTargetDependency */, + 43D371C317096E6D00B3B844 /* PBXTargetDependency */, + 43D371C717096E6D00B3B844 /* PBXTargetDependency */, + 43D371C917096E6D00B3B844 /* PBXTargetDependency */, + 43D371CB17096E6D00B3B844 /* PBXTargetDependency */, + 43D371CD17096E6D00B3B844 /* PBXTargetDependency */, + 43D371CF17096E6D00B3B844 /* PBXTargetDependency */, + 43D371D117096E6D00B3B844 /* PBXTargetDependency */, + 43D371D317096E6D00B3B844 /* PBXTargetDependency */, + 43D371D517096E6D00B3B844 /* PBXTargetDependency */, + 43D371D717096E6D00B3B844 /* PBXTargetDependency */, + 43D371D917096E6D00B3B844 /* PBXTargetDependency */, + 43D371DB17096E6D00B3B844 /* PBXTargetDependency */, + 43D371DD17096E6D00B3B844 /* PBXTargetDependency */, + 43D371DF17096E6D00B3B844 /* PBXTargetDependency */, + 43D371E117096E6D00B3B844 /* PBXTargetDependency */, + 43D371E317096E6D00B3B844 /* PBXTargetDependency */, + 43D371E517096E6D00B3B844 /* PBXTargetDependency */, + 43D371E717096E6D00B3B844 /* PBXTargetDependency */, + 43D371E917096E6D00B3B844 /* PBXTargetDependency */, + 43D371EB17096E6D00B3B844 /* PBXTargetDependency */, + 43D371ED17096E6D00B3B844 /* PBXTargetDependency */, + 43D371EF17096E6D00B3B844 /* PBXTargetDependency */, + ); + name = Tools; + productName = Tools; + }; + 43D371F017096E7D00B3B844 /* Bundle */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 43D371F117096E7D00B3B844 /* Build configuration list for PBXAggregateTarget "Bundle" */; + buildPhases = ( + 43D3720017096EC300B3B844 /* Run Script - Remove Installer folder */, + 43D3720217096EF800B3B844 /* CopyFiles */, + 43A22BCA170CCD2600D5A7CC /* Run Script - Link HuginStitchProject.app Libraries in Hugin.app */, + 43D3720617096F2400B3B844 /* Run Script - Create stripped apps for installer */, + 43D3720717096F5400B3B844 /* Run Script - Create HuginTools folder with symlinks */, + ); + dependencies = ( + 43D371F517096E8900B3B844 /* PBXTargetDependency */, + 43D371F717096E8900B3B844 /* PBXTargetDependency */, + 43D371FB17096E8900B3B844 /* PBXTargetDependency */, + 43D371FD17096E8900B3B844 /* PBXTargetDependency */, + 43D371FF17096E8900B3B844 /* PBXTargetDependency */, + ); + name = Bundle; + productName = Bundle; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 430A82E01715E87300AA0BD9 /* _hsi.so in Copy Files - Python Modules */ = {isa = PBXBuildFile; fileRef = 43D3718217079EC400B3B844 /* _hsi.so */; }; + 430A82E51715E89400AA0BD9 /* hpi.py in Copy Files - Python Modules */ = {isa = PBXBuildFile; fileRef = 430A82E31715E88E00AA0BD9 /* hpi.py */; }; + 430A82E61715E89400AA0BD9 /* hsi.py in Copy Files - Python Modules */ = {isa = PBXBuildFile; fileRef = 430A82E41715E88E00AA0BD9 /* hsi.py */; }; + 430A82E71716081100AA0BD9 /* libhpi-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43353479171388F200889E02 /* libhpi-2013.0.dylib */; }; + 43352ED11713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED21713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 43352ED31713523C00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED41713524100889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 43352ED51713524A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED61713525100889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 43352ED71713525B00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ECF1713522A00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; }; + 43352ED81713526000889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352ED01713522A00889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; }; + 433534A517138FFD00889E02 /* libhpi-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43353479171388F200889E02 /* libhpi-2013.0.dylib */; }; + 433534D21714B69E00889E02 /* crop_cp.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534CC1714B67700889E02 /* crop_cp.py */; }; + 433534D31714B69E00889E02 /* shooting_pattern.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534CE1714B67700889E02 /* shooting_pattern.py */; }; + 433534D41714B69E00889E02 /* top_five.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534CF1714B67700889E02 /* top_five.py */; }; + 433534D51714B69E00889E02 /* woa.py in Copy Files - Python Plugins */ = {isa = PBXBuildFile; fileRef = 433534D01714B67700889E02 /* woa.py */; }; + 43760F3A170748D300ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43760F3E1707491100ED2679 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F3D1707491100ED2679 /* Carbon.framework */; }; + 43760F5C17074E5800ED2679 /* LensCalApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5417074E5800ED2679 /* LensCalApp.cpp */; }; + 43760F5D17074E5800ED2679 /* LensCalFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5617074E5800ED2679 /* LensCalFrame.cpp */; }; + 43760F5E17074E5800ED2679 /* LensCalImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5817074E5800ED2679 /* LensCalImageCtrl.cpp */; }; + 43760F5F17074E5800ED2679 /* LensCalTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F5A17074E5800ED2679 /* LensCalTypes.cpp */; }; + 43760F6617074E7300ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43760F6717074E7300ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43760F6817074E7300ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43760F6B17074FF900ED2679 /* liblines-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DE17057D5500D165A4 /* liblines-2013.0.dylib */; }; + 43760F711707506F00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F5117074D6500ED2679 /* libpano13.2.dylib */; }; + 43760F721707506F00ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43760F741707508F00ED2679 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F731707508F00ED2679 /* CoreFoundation.framework */; }; + 43760F861707514400ED2679 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F761707514400ED2679 /* Batch.cpp */; }; + 43760F871707514400ED2679 /* BatchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F781707514400ED2679 /* BatchFrame.cpp */; }; + 43760F881707514400ED2679 /* BatchTrayIcon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F7A1707514400ED2679 /* BatchTrayIcon.cpp */; }; + 43760F891707514400ED2679 /* FailedProjectsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F7C1707514400ED2679 /* FailedProjectsDialog.cpp */; }; + 43760F8A1707514400ED2679 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F7E1707514400ED2679 /* ProjectArray.cpp */; }; + 43760F8B1707514400ED2679 /* ProjectListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F801707514400ED2679 /* ProjectListBox.cpp */; }; + 43760F8C1707514400ED2679 /* PTBatcherGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F821707514400ED2679 /* PTBatcherGUI.cpp */; }; + 43760F8D1707514400ED2679 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F841707514400ED2679 /* RunStitchFrame.cpp */; }; + 43760F941707515A00ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43760F951707515A00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43760F961707515A00ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43760F99170751F900ED2679 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F731707508F00ED2679 /* CoreFoundation.framework */; }; + 43760F9A1707520A00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F5117074D6500ED2679 /* libpano13.2.dylib */; }; + 43760F9E1707528B00ED2679 /* FindPanoDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760F9C1707528B00ED2679 /* FindPanoDialog.cpp */; }; + 43760F9F170752F700ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43761020170753AA00ED2679 /* AboutDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA1170753AA00ED2679 /* AboutDialog.cpp */; }; + 43761021170753AA00ED2679 /* ChoosyRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA3170753AA00ED2679 /* ChoosyRemapper.cpp */; }; + 43761022170753AA00ED2679 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA5170753AA00ED2679 /* CommandHistory.cpp */; }; + 43761023170753AA00ED2679 /* CPDetectorDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FA8170753AA00ED2679 /* CPDetectorDialog.cpp */; }; + 43761024170753AA00ED2679 /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FAA170753AA00ED2679 /* CPEditorPanel.cpp */; }; + 43761025170753AA00ED2679 /* CPImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FAC170753AA00ED2679 /* CPImageCtrl.cpp */; }; + 43761026170753AA00ED2679 /* CPImagesComboBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FAE170753AA00ED2679 /* CPImagesComboBox.cpp */; }; + 43761027170753AA00ED2679 /* CPListFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB0170753AA00ED2679 /* CPListFrame.cpp */; }; + 43761028170753AA00ED2679 /* DragTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB2170753AA00ED2679 /* DragTool.cpp */; }; + 43761029170753AA00ED2679 /* GLPreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB4170753AA00ED2679 /* GLPreviewFrame.cpp */; }; + 4376102A170753AA00ED2679 /* GLRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB6170753AA00ED2679 /* GLRenderer.cpp */; }; + 4376102B170753AA00ED2679 /* GLViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FB8170753AA00ED2679 /* GLViewer.cpp */; }; + 4376102C170753AA00ED2679 /* GreatCircles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FBA170753AA00ED2679 /* GreatCircles.cpp */; }; + 4376102D170753AA00ED2679 /* GuiLevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FBC170753AA00ED2679 /* GuiLevel.cpp */; }; + 4376102E170753AA00ED2679 /* HDRMergeOptionDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FBE170753AA00ED2679 /* HDRMergeOptionDialog.cpp */; }; + 4376102F170753AA00ED2679 /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC0170753AA00ED2679 /* HFOVDialog.cpp */; }; + 43761030170753AA00ED2679 /* HtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC2170753AA00ED2679 /* HtmlWindow.cpp */; }; + 43761031170753AA00ED2679 /* huginApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC4170753AA00ED2679 /* huginApp.cpp */; }; + 43761032170753AA00ED2679 /* ImagesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC6170753AA00ED2679 /* ImagesList.cpp */; }; + 43761033170753AA00ED2679 /* ImagesPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FC8170753AA00ED2679 /* ImagesPanel.cpp */; }; + 43761034170753AA00ED2679 /* ImagesTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FCA170753AA00ED2679 /* ImagesTree.cpp */; }; + 43761035170753AA00ED2679 /* ImageVariableDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FCC170753AA00ED2679 /* ImageVariableDialog.cpp */; }; + 43761036170753AA00ED2679 /* LayoutRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FCE170753AA00ED2679 /* LayoutRemapper.cpp */; }; + 43761037170753AA00ED2679 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD0170753AA00ED2679 /* LocalizedFileTipProvider.cpp */; }; + 43761038170753AA00ED2679 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD2170753AA00ED2679 /* MainFrame.cpp */; }; + 43761039170753AA00ED2679 /* MaskEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD4170753AA00ED2679 /* MaskEditorPanel.cpp */; }; + 4376103A170753AA00ED2679 /* MaskImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD6170753AA00ED2679 /* MaskImageCtrl.cpp */; }; + 4376103B170753AA00ED2679 /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FD8170753AA00ED2679 /* MaskLoadDialog.cpp */; }; + 4376103C170753AA00ED2679 /* MeshManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FDA170753AA00ED2679 /* MeshManager.cpp */; }; + 4376103D170753AA00ED2679 /* MeshRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FDC170753AA00ED2679 /* MeshRemapper.cpp */; }; + 4376103E170753AA00ED2679 /* NonaOptionsDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FDE170753AA00ED2679 /* NonaOptionsDialog.cpp */; }; + 4376103F170753AA00ED2679 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE0170753AA00ED2679 /* OptimizePanel.cpp */; }; + 43761040170753AA00ED2679 /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE2170753AA00ED2679 /* OptimizePhotometricPanel.cpp */; }; + 43761041170753AA00ED2679 /* OutputProjectionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE4170753AA00ED2679 /* OutputProjectionInfo.cpp */; }; + 43761042170753AA00ED2679 /* OverviewCameraTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE6170753AA00ED2679 /* OverviewCameraTool.cpp */; }; + 43761043170753AA00ED2679 /* OverviewOutlinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FE8170753AA00ED2679 /* OverviewOutlinesTool.cpp */; }; + 43761044170753AA00ED2679 /* PanoOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FEA170753AA00ED2679 /* PanoOperation.cpp */; }; + 43761045170753AA00ED2679 /* PanoOutputDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FEC170753AA00ED2679 /* PanoOutputDialog.cpp */; }; + 43761046170753AA00ED2679 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FEE170753AA00ED2679 /* PanoPanel.cpp */; }; + 43761047170753AA00ED2679 /* PanosphereSphereTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF0170753AA00ED2679 /* PanosphereSphereTool.cpp */; }; + 43761048170753AA00ED2679 /* PluginItems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF2170753AA00ED2679 /* PluginItems.cpp */; }; + 43761049170753AA00ED2679 /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF4170753AA00ED2679 /* PreferencesDialog.cpp */; }; + 4376104A170753AA00ED2679 /* PreviewColorPickerTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF6170753AA00ED2679 /* PreviewColorPickerTool.cpp */; }; + 4376104B170753AA00ED2679 /* PreviewControlPointTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FF8170753AA00ED2679 /* PreviewControlPointTool.cpp */; }; + 4376104C170753AA00ED2679 /* PreviewCropTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FFA170753AA00ED2679 /* PreviewCropTool.cpp */; }; + 4376104D170753AA00ED2679 /* PreviewDifferenceTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FFC170753AA00ED2679 /* PreviewDifferenceTool.cpp */; }; + 4376104E170753AA00ED2679 /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760FFE170753AA00ED2679 /* PreviewFrame.cpp */; }; + 4376104F170753AA00ED2679 /* PreviewGuideTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761000170753AA00ED2679 /* PreviewGuideTool.cpp */; }; + 43761050170753AA00ED2679 /* PreviewIdentifyTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761002170753AA00ED2679 /* PreviewIdentifyTool.cpp */; }; + 43761051170753AA00ED2679 /* PreviewLayoutLinesTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761004170753AA00ED2679 /* PreviewLayoutLinesTool.cpp */; }; + 43761052170753AA00ED2679 /* PreviewPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761006170753AA00ED2679 /* PreviewPanel.cpp */; }; + 43761053170753AA00ED2679 /* PreviewPanoMaskTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761008170753AA00ED2679 /* PreviewPanoMaskTool.cpp */; }; + 43761054170753AA00ED2679 /* ProjectionGridTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376100A170753AA00ED2679 /* ProjectionGridTool.cpp */; }; + 43761055170753AA00ED2679 /* ResetDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376100C170753AA00ED2679 /* ResetDialog.cpp */; }; + 43761056170753AA00ED2679 /* TexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376100E170753AA00ED2679 /* TexCoordRemapper.cpp */; }; + 43761057170753AA00ED2679 /* TextKillFocusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761010170753AA00ED2679 /* TextKillFocusHandler.cpp */; }; + 43761058170753AA00ED2679 /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761012170753AA00ED2679 /* TextureManager.cpp */; }; + 43761059170753AA00ED2679 /* Tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761014170753AA00ED2679 /* Tool.cpp */; }; + 4376105A170753AA00ED2679 /* ToolHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761016170753AA00ED2679 /* ToolHelper.cpp */; }; + 4376105B170753AA00ED2679 /* treelistctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43761018170753AA00ED2679 /* treelistctrl.cpp */; }; + 4376105C170753AA00ED2679 /* VertexCoordRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376101A170753AA00ED2679 /* VertexCoordRemapper.cpp */; }; + 4376105D170753AA00ED2679 /* ViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376101C170753AA00ED2679 /* ViewState.cpp */; }; + 4376105E170753AA00ED2679 /* wxPanoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4376101E170753AA00ED2679 /* wxPanoCommand.cpp */; }; + 43761065170753F400ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43761066170753F400ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43761067170753F400ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43A22BC2170B938E00D5A7CC /* liblensdb-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D817057D5500D165A4 /* liblensdb-2013.0.dylib */; }; + 43A22BC3170B938E00D5A7CC /* liblines-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DE17057D5500D165A4 /* liblines-2013.0.dylib */; }; + 43A22BC4170B938E00D5A7CC /* liblocalfeatures-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E217057D5500D165A4 /* liblocalfeatures-2013.0.dylib */; }; + 43A22BC5170B938E00D5A7CC /* libflann-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E417057D5500D165A4 /* libflann-2013.0.dylib */; }; + 43BA38B617058F7A00D165A4 /* hugin_stitch_project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA38B517058F7A00D165A4 /* hugin_stitch_project.cpp */; }; + 43BA38B717058F9500D165A4 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43BA38B817058F9500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43BA38B917058F9500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D3712F170781FE00B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D371531707821E00B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D371541707823900B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D371561707824900B3B844 /* libboost_thread-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371551707824900B3B844 /* libboost_thread-1_46.dylib */; }; + 43D371571707930400B3B844 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F731707508F00ED2679 /* CoreFoundation.framework */; }; + 43D37158170793AF00B3B844 /* libceleste-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E017057D5500D165A4 /* libceleste-2013.0.dylib */; }; + 43D3715D170793FB00B3B844 /* libmakefile-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D3715E1707943900B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3712E170781FE00B3B844 /* libboost_system-1_46.dylib */; }; + 43D3715F1707943900B3B844 /* libboost_thread-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371551707824900B3B844 /* libboost_thread-1_46.dylib */; }; + 43D371611707943900B3B844 /* libboost_signals-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371601707943900B3B844 /* libboost_signals-1_46.dylib */; }; + 43D371631707946000B3B844 /* libGLEW.1.9.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371621707946000B3B844 /* libGLEW.1.9.0.dylib */; }; + 43D371651707947600B3B844 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D371641707947600B3B844 /* OpenGL.framework */; }; + 43D371661707949B00B3B844 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F5117074D6500ED2679 /* libpano13.2.dylib */; }; + 43D37168170794AE00B3B844 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D37167170794AD00B3B844 /* GLUT.framework */; }; + 43D371691707956000B3B844 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F37170748D300ED2679 /* libtiff.3.dylib */; }; + 43D3716B1707956000B3B844 /* libexiv2.12.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D3716A1707956000B3B844 /* libexiv2.12.dylib */; }; + 43D3716C1707960800B3B844 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F3D1707491100ED2679 /* Carbon.framework */; }; + 43D3716D170796B400B3B844 /* libicpfind-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA37E817057D5500D165A4 /* libicpfind-2013.0.dylib */; }; + 43D371881707A4CC00B3B844 /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 43D371841707A03A00B3B844 /* Hugin.icns */; }; + 43D371891707A4CC00B3B844 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 43D371851707A03A00B3B844 /* HuginFiles.icns */; }; + 43D371AC17082CCC00B3B844 /* HuginStitchProject.app in Resources */ = {isa = PBXBuildFile; fileRef = 43BA375117057C3500D165A4 /* HuginStitchProject.app */; }; + 43D371B41708DB4100B3B844 /* libhugin_vigra_impex-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D371B51708DB4100B3B844 /* libhugin_base-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43D371B61708DB4100B3B844 /* libceleste-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E017057D5500D165A4 /* libceleste-2013.0.dylib */; }; + 43D371B71708DB4100B3B844 /* libbase_wx-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43D371B81708DB4100B3B844 /* libicpfind-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E817057D5500D165A4 /* libicpfind-2013.0.dylib */; }; + 43D371B91708DB8900B3B844 /* libmakefile-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D371BA1708DE6400B3B844 /* liblevmar-2013.0.dylib in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D617057D5500D165A4 /* liblevmar-2013.0.dylib */; }; + 43D371BB1708E1E600B3B844 /* PTBatcherGui.icns in Resources */ = {isa = PBXBuildFile; fileRef = 43D371861707A03A00B3B844 /* PTBatcherGui.icns */; }; + 43D3720317096F1200B3B844 /* Hugin.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BA373017057B4100D165A4 /* Hugin.app */; }; + 43D3720417096F1200B3B844 /* PTBatcherGUI.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BA378717057C5100D165A4 /* PTBatcherGUI.app */; }; + 43D3720517096F1200B3B844 /* CalibrateLensGUI.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BA37A217057C6300D165A4 /* CalibrateLensGUI.app */; }; + 43D3723117097E4700B3B844 /* libhugin_vigra_impex-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D3723217097E4700B3B844 /* liblevmar-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D617057D5500D165A4 /* liblevmar-2013.0.dylib */; }; + 43D3723317097E4700B3B844 /* libhugin_base-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43D3723417097E4700B3B844 /* libbase_wx-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43D372361709800300B3B844 /* libhugin_vigra_impex-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D417057D5500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; }; + 43D372371709800300B3B844 /* libhugin_base-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DA17057D5500D165A4 /* libhugin_base-2013.0.dylib */; }; + 43D372381709800300B3B844 /* liblines-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DE17057D5500D165A4 /* liblines-2013.0.dylib */; }; + 43D372391709800300B3B844 /* libbase_wx-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37E617057D5500D165A4 /* libbase_wx-2013.0.dylib */; }; + 43D3723A1709801000B3B844 /* libmakefile-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D372401709836000B3B844 /* libmakefile-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37DC17057D5500D165A4 /* libmakefile-2013.0.dylib */; }; + 43D372411709853500B3B844 /* liblevmar-2013.0.dylib in Copy Files - Libraries */ = {isa = PBXBuildFile; fileRef = 43BA37D617057D5500D165A4 /* liblevmar-2013.0.dylib */; }; + 43E38DFA173780AA00436356 /* Python27.framework in Copy Files - Copy Libraries */ = {isa = PBXBuildFile; fileRef = 43E38DF9173780AA00436356 /* Python27.framework */; }; + 43E88A70170F84BF00B35E48 /* align_image_stack in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA37FF17057D5500D165A4 /* align_image_stack */; }; + 43E88A71170F84BF00B35E48 /* autooptimiser in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380117057D5500D165A4 /* autooptimiser */; }; + 43E88A72170F84BF00B35E48 /* cpclean in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380717057D5500D165A4 /* cpclean */; }; + 43E88A73170F84BF00B35E48 /* checkpto in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380517057D5500D165A4 /* checkpto */; }; + 43E88A74170F84BF00B35E48 /* cpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380917057D5500D165A4 /* cpfind */; }; + 43E88A75170F84BF00B35E48 /* fulla in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380B17057D5500D165A4 /* fulla */; }; + 43E88A76170F84BF00B35E48 /* hugin_hdrmerge in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380D17057D5500D165A4 /* hugin_hdrmerge */; }; + 43E88A77170F84BF00B35E48 /* icpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380F17057D5500D165A4 /* icpfind */; }; + 43E88A78170F84BF00B35E48 /* linefind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381117057D5500D165A4 /* linefind */; }; + 43E88A79170F84BF00B35E48 /* nona in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381317057D5500D165A4 /* nona */; }; + 43E88A7A170F84BF00B35E48 /* pano_trafo in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381517057D5500D165A4 /* pano_trafo */; }; + 43E88A7B170F84BF00B35E48 /* pano_modify in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381717057D5500D165A4 /* pano_modify */; }; + 43E88A7C170F84BF00B35E48 /* pto2mk in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381917057D5500D165A4 /* pto2mk */; }; + 43E88A7D170F84BF00B35E48 /* pto_merge in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381B17057D5500D165A4 /* pto_merge */; }; + 43E88A7E170F84BF00B35E48 /* pto_gen in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381D17057D5500D165A4 /* pto_gen */; }; + 43E88A7F170F84BF00B35E48 /* tca_correct in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381F17057D5500D165A4 /* tca_correct */; }; + 43E88A80170F84BF00B35E48 /* deghosting_mask in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382117057D5500D165A4 /* deghosting_mask */; }; + 43E88A81170F84BF00B35E48 /* matchpoint in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382317057D5500D165A4 /* matchpoint */; }; + 43E88A82170F84BF00B35E48 /* PTBatcher in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382517057D5500D165A4 /* PTBatcher */; }; + 43E88A83170F84BF00B35E48 /* vig_optimize in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA382717057D5500D165A4 /* vig_optimize */; }; + 43E88A84170F84BF00B35E48 /* geocpset in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43760E931706517500ED2679 /* geocpset */; }; + 43E88A85170F84BF00B35E48 /* pto_var in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43760E951706517500ED2679 /* pto_var */; }; + 43E88A86170F84BF00B35E48 /* pto_lensstack in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43760E971706517500ED2679 /* pto_lensstack */; }; + 43E88A87170F84BF00B35E48 /* celeste_standalone in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43D372611709954800B3B844 /* celeste_standalone */; }; + 43E88A8B170F85B600B35E48 /* align_image_stack in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA37FF17057D5500D165A4 /* align_image_stack */; }; + 43E88A8C170F85B600B35E48 /* cpclean in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380717057D5500D165A4 /* cpclean */; }; + 43E88A8D170F85B600B35E48 /* checkpto in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380517057D5500D165A4 /* checkpto */; }; + 43E88A8E170F85B600B35E48 /* cpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380917057D5500D165A4 /* cpfind */; }; + 43E88A8F170F85B600B35E48 /* hugin_hdrmerge in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380D17057D5500D165A4 /* hugin_hdrmerge */; }; + 43E88A90170F85B600B35E48 /* icpfind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380F17057D5500D165A4 /* icpfind */; }; + 43E88A91170F85B600B35E48 /* linefind in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381117057D5500D165A4 /* linefind */; }; + 43E88A92170F85B600B35E48 /* nona in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381317057D5500D165A4 /* nona */; }; + 43E88A93170F85B600B35E48 /* pano_modify in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA381717057D5500D165A4 /* pano_modify */; }; + 43E88A94170F85B600B35E48 /* celeste_standalone in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43D372611709954800B3B844 /* celeste_standalone */; }; + 43E88A95170F85C000B35E48 /* autooptimiser in Copy Files - Tools */ = {isa = PBXBuildFile; fileRef = 43BA380117057D5500D165A4 /* autooptimiser */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 430A82EB1716122600AA0BD9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43D3717817079DD100B3B844; + remoteInfo = hsi; + }; + 43353478171388F200889E02 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 433534601713868B00889E02; + remoteInfo = hpi; + }; + 4335349717138FE600889E02 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 4335345F1713868B00889E02; + remoteInfo = hpi; + }; + 43760E921706517500ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43760E4117064FC400ED2679; + remoteInfo = geocpset; + }; + 43760E941706517500ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43760E551706500C00ED2679; + remoteInfo = pto_var; + }; + 43760E961706517500ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43760E641706504700ED2679; + remoteInfo = pto_lensstack; + }; + 43760F6017074E6600ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA31B61702E7D500D165A4; + remoteInfo = hugin_vigra_impex; + }; + 43760F6217074E6600ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA32701703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43760F6417074E6600ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA35271704F90600D165A4; + remoteInfo = base_wx; + }; + 43760F6C17074FFD00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA34281704354300D165A4; + remoteInfo = lines; + }; + 43760F8E1707515200ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA31B61702E7D500D165A4; + remoteInfo = hugin_vigra_impex; + }; + 43760F901707515200ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA32701703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43760F921707515200ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA35271704F90600D165A4; + remoteInfo = base_wx; + }; + 4376105F170753EC00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA31B61702E7D500D165A4; + remoteInfo = hugin_vigra_impex; + }; + 43761061170753EC00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA32701703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43761063170753EC00ED2679 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 43BA35271704F90600D165A4; + remoteInfo = base_wx; + }; + 43A22C0F170E259900D5A7CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43A22BD2170E21B700D5A7CC; + remoteInfo = zthread; + }; + 43BA37D317057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA31B71702E7D500D165A4; + remoteInfo = vigra_impex; + }; + 43BA37D517057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA32301703A4F200D165A4; + remoteInfo = levmar; + }; + 43BA37D717057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA325C1703A5BE00D165A4; + remoteInfo = lensdb; + }; + 43BA37D917057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA32711703AE6200D165A4; + remoteInfo = hugin_base; + }; + 43BA37DB17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA327A1703AED500D165A4; + remoteInfo = makefile; + }; + 43BA37DD17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA34291704354300D165A4; + remoteInfo = lines; + }; + 43BA37DF17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA344D1704ED3000D165A4; + remoteInfo = celeste; + }; + 43BA37E117057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA349D1704F59500D165A4; + remoteInfo = localfeatures; + }; + 43BA37E317057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA34D51704F65E00D165A4; + remoteInfo = flann; + }; + 43BA37E517057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35281704F90600D165A4; + remoteInfo = base_wx; + }; + 43BA37E717057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37BF17057D5400D165A4 /* Libraries.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA36E81705750400D165A4; + remoteInfo = icpfind; + }; + 43BA37FE17057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA355E170506D100D165A4; + remoteInfo = align_image_stack; + }; + 43BA380017057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA359E17056FC300D165A4; + remoteInfo = autooptimiser; + }; + 43BA380417057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35DB1705718500D165A4; + remoteInfo = checkpto; + }; + 43BA380617057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35CE1705717500D165A4; + remoteInfo = cpclean; + }; + 43BA380817057D5500D165A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 43BA37C217057D5400D165A4 /* Tools.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 43BA35E81705719100D165A4; |
From: <hug...@li...> - 2013-09-09 17:51:11
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/a9991501efd8 changeset: 6283:a9991501efd8 user: tmodes date: Thu May 16 22:09:06 2013 +0200 description: Updated Chinese Traditional translation (Rick Langford) diffstat: src/translations/zh_TW.po | 140 +++++++++++++++++---------------------------- 1 files changed, 52 insertions(+), 88 deletions(-) diffs (467 lines): diff -r f6fff45d5eac -r a9991501efd8 src/translations/zh_TW.po --- a/src/translations/zh_TW.po Tue May 07 21:56:31 2013 +0200 +++ b/src/translations/zh_TW.po Thu May 16 22:09:06 2013 +0200 @@ -4,15 +4,14 @@ "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" "PO-Revision-Date: \n" -"Last-Translator: Ewing Kang <f03...@ya...>\n" +"Last-Translator: Rick Langford <ru...@ya...>\n" "Language-Team: Chinese Traditional <NA>\n" -"Language: \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Chinese\n" -"X-Poedit-Country: TAIWAN\n" "X-Poedit-Bookmarks: -1,277,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Generator: Poedit 1.5.5\n" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 #, c-format @@ -92,19 +91,16 @@ msgstr "注意" #: hugin1/base_wx/huginConfig.cpp:288 -#, fuzzy msgid "first image" -msgstr "儲存裁剪後的圖片" +msgstr "第一張照片" #: hugin1/base_wx/huginConfig.cpp:289 -#, fuzzy msgid "last image" -msgstr "增加圖片" +msgstr "最後一張照片" #: hugin1/base_wx/huginConfig.cpp:291 -#, fuzzy msgid "directory" -msgstr "偵測器" +msgstr "目錄" #: hugin1/base_wx/huginConfig.cpp:292 hugin1/base_wx/LensTools.cpp:41 #: hugin1/hugin/GLPreviewFrame.cpp:1488 hugin1/hugin/ImagesTree.cpp:370 @@ -113,14 +109,12 @@ msgstr "等距長方圓柱" #: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 -#, fuzzy msgid "Camera maker" -msgstr "照相機製造商:" +msgstr "照相機製造商" #: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 -#, fuzzy msgid "Camera model" -msgstr "照相機型號:" +msgstr "照相機型號" #: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:666 #: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 @@ -130,9 +124,8 @@ msgstr "鏡頭" #: hugin1/base_wx/huginConfig.cpp:335 -#, fuzzy msgid "unknown projection" -msgstr "投影" +msgstr "" #: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 msgid "Normal (rectilinear)" @@ -325,11 +318,11 @@ msgstr "接合時發生錯誤" #: hugin1/base_wx/RunStitchPanel.cpp:371 -#, fuzzy, c-format +#, c-format msgid "" "Error while running assistant\n" "%s" -msgstr "分析 panotools 程式碼時發生錯誤: %s" +msgstr "" #: hugin1/base_wx/RunStitchPanel.cpp:372 hugin1/base_wx/RunStitchPanel.cpp:380 #, fuzzy @@ -520,9 +513,8 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:617 #: hugin1/calibrate_lens/LensCalFrame.cpp:733 -#, fuzzy msgid "Finished" -msgstr "芬蘭文" +msgstr "" #: hugin1/calibrate_lens/LensCalFrame.cpp:633 msgid "" @@ -581,7 +573,7 @@ #: xrc.cpp:276 #, fuzzy msgid "Save lens" -msgstr "儲存鏡頭..." +msgstr "儲存鏡頭" #: hugin1/calibrate_lens/LensCalFrame.cpp:806 hugin1/hugin/MainFrame.cpp:860 msgid "Save project file" @@ -620,9 +612,9 @@ msgstr "使用中的字碼頁: %u" #: hugin1/hugin/AboutDialog.cpp:174 -#, fuzzy, c-format +#, c-format msgid "Version: %s" -msgstr "版本 %s" +msgstr "版本: %s" #: hugin1/hugin/AboutDialog.cpp:175 #, c-format @@ -1561,24 +1553,20 @@ msgstr "鏡頭編號" #: hugin1/hugin/ImagesTree.cpp:142 -#, fuzzy msgid "Width" -msgstr "寬度:" +msgstr "寬度" #: hugin1/hugin/ImagesTree.cpp:142 -#, fuzzy msgid "Image width" -msgstr "圖片尺寸:" +msgstr "圖片寬度" #: hugin1/hugin/ImagesTree.cpp:143 -#, fuzzy msgid "Height" -msgstr "高度:" +msgstr "高度" #: hugin1/hugin/ImagesTree.cpp:143 -#, fuzzy msgid "Image height" -msgstr "圖片修剪" +msgstr "圖片高度" #: hugin1/hugin/ImagesTree.cpp:144 msgid "Anchor" @@ -1620,12 +1608,11 @@ #: hugin1/hugin/ImagesTree.cpp:149 #, fuzzy msgid "Maker" -msgstr "照相機製造商:" +msgstr "製造商:" #: hugin1/hugin/ImagesTree.cpp:150 -#, fuzzy msgid "Model" -msgstr "型號:" +msgstr "型號" #: hugin1/hugin/ImagesTree.cpp:151 #, fuzzy @@ -1642,63 +1629,52 @@ msgstr "" #: hugin1/hugin/ImagesTree.cpp:153 -#, fuzzy msgid "Focal length" -msgstr "焦距:" +msgstr "焦距" #: hugin1/hugin/ImagesTree.cpp:154 -#, fuzzy msgid "Aperture" -msgstr "光圈:" +msgstr "光圈" #: hugin1/hugin/ImagesTree.cpp:155 -#, fuzzy msgid "Shutter Speed" -msgstr "快門速度:" +msgstr "快門速度" #: hugin1/hugin/ImagesTree.cpp:155 -#, fuzzy msgid "Shutter speed" -msgstr "快門速度:" +msgstr "快門速度" #: hugin1/hugin/ImagesTree.cpp:156 -#, fuzzy msgid "ISO" -msgstr "ISO感光度:" +msgstr "ISO" #: hugin1/hugin/ImagesTree.cpp:156 msgid "ISO speed" msgstr "" #: hugin1/hugin/ImagesTree.cpp:158 -#, fuzzy msgid "Yaw (y)" msgstr "橫向角度 (y)" #: hugin1/hugin/ImagesTree.cpp:158 -#, fuzzy msgid "Yaw" -msgstr "橫向角度:" +msgstr "橫向角度" #: hugin1/hugin/ImagesTree.cpp:159 -#, fuzzy msgid "Pitch (p)" msgstr "縱向角度 (p)" #: hugin1/hugin/ImagesTree.cpp:159 -#, fuzzy msgid "Pitch" -msgstr "縱向角度:" +msgstr "縱向角度" #: hugin1/hugin/ImagesTree.cpp:160 -#, fuzzy msgid "Roll (r)" msgstr "旋轉角度 (r)" #: hugin1/hugin/ImagesTree.cpp:160 -#, fuzzy msgid "Roll" -msgstr "旋轉角度:" +msgstr "旋轉角度" #: hugin1/hugin/ImagesTree.cpp:161 #, fuzzy @@ -1822,14 +1798,14 @@ msgstr "線性的" #: hugin1/hugin/ImagesTree.cpp:663 -#, fuzzy, c-format +#, c-format msgid "Lens %d" -msgstr "鏡頭" +msgstr "鏡頭 %d" #: hugin1/hugin/ImagesTree.cpp:666 #, fuzzy, c-format msgid "Stack %d" -msgstr "堆棧:" +msgstr "堆棧圖 %d" #: hugin1/hugin/ImagesTree.cpp:669 #, c-format @@ -2495,7 +2471,6 @@ msgstr "錨定這張圖片以便調整光圈" #: hugin1/hugin/PanoOperation.cpp:438 -#, fuzzy msgid "New lens" msgstr "新鏡頭" @@ -2855,9 +2830,8 @@ msgstr "捷克文" #: hugin1/hugin/PreferencesDialog.cpp:134 -#, fuzzy msgid "Danish" -msgstr "西班牙文" +msgstr "丹麥文" #: hugin1/hugin/PreferencesDialog.cpp:137 msgid "Dutch" @@ -3611,9 +3585,8 @@ msgstr "新增專案 %s 到助手列表中" #: hugin1/ptbatcher/BatchTrayIcon.cpp:81 -#, fuzzy msgid "E&xit" -msgstr "退出 (&x)\tAlt-X" +msgstr "退出 (&x)" #: hugin1/ptbatcher/FindPanoDialog.cpp:195 msgid "" @@ -3640,7 +3613,6 @@ "你仍然要繼續嗎?" #: hugin1/ptbatcher/FindPanoDialog.cpp:240 -#, fuzzy msgid "Stop" msgstr "停止" @@ -3676,9 +3648,8 @@ msgstr "載入圖片 %s" #: hugin1/ptbatcher/FindPanoDialog.cpp:409 translations/xrc.cpp:40 xrc.cpp:40 -#, fuzzy msgid "Start" -msgstr "開始了" +msgstr "開始" #: hugin1/ptbatcher/FindPanoDialog.cpp:415 #, fuzzy, c-format @@ -3961,9 +3932,8 @@ msgstr "" #: translations/xrc.cpp:32 xrc.cpp:32 -#, fuzzy msgid "Directory:" -msgstr "偵測器" +msgstr "目錄:" #: translations/xrc.cpp:33 translations/xrc.cpp:128 translations/xrc.cpp:133 #: translations/xrc.cpp:136 translations/xrc.cpp:141 translations/xrc.cpp:771 @@ -4506,8 +4476,9 @@ msgstr "" #: translations/xrc.cpp:184 xrc.cpp:184 +#, fuzzy msgid "Display" -msgstr "" +msgstr "展示" #: translations/xrc.cpp:185 translations/xrc.cpp:657 xrc.cpp:185 xrc.cpp:657 msgid "General" @@ -4515,7 +4486,7 @@ #: translations/xrc.cpp:186 xrc.cpp:186 msgid "EXIF data" -msgstr "" +msgstr "EXIF 數據" #: translations/xrc.cpp:187 translations/xrc.cpp:222 xrc.cpp:187 xrc.cpp:222 #, fuzzy @@ -4579,8 +4550,9 @@ msgstr "幾何的" #: translations/xrc.cpp:201 translations/xrc.cpp:203 xrc.cpp:201 xrc.cpp:203 +#, fuzzy msgid "Calculate" -msgstr "" +msgstr "計算" #: translations/xrc.cpp:202 xrc.cpp:202 #, fuzzy @@ -4701,9 +4673,8 @@ msgstr "光圈和顏色" #: translations/xrc.cpp:238 xrc.cpp:238 -#, fuzzy msgid "Exposure (Eev):" -msgstr "光圈 (EV)" +msgstr "光圈 (Eev):" #: translations/xrc.cpp:239 xrc.cpp:239 #, fuzzy @@ -4810,13 +4781,11 @@ #: translations/xrc.cpp:288 translations/xrc.cpp:304 translations/xrc.cpp:320 #: xrc.cpp:288 xrc.cpp:304 xrc.cpp:320 -#, fuzzy msgid "Camera maker:" msgstr "照相機製造商:" #: translations/xrc.cpp:289 translations/xrc.cpp:305 translations/xrc.cpp:321 #: xrc.cpp:289 xrc.cpp:305 xrc.cpp:321 -#, fuzzy msgid "Camera model:" msgstr "照相機型號:" @@ -4835,8 +4804,9 @@ msgstr "" #: translations/xrc.cpp:293 xrc.cpp:293 +#, fuzzy msgid "Search" -msgstr "" +msgstr "尋找" #: translations/xrc.cpp:295 translations/xrc.cpp:311 xrc.cpp:295 xrc.cpp:311 msgid "Aperture:" @@ -4899,18 +4869,16 @@ msgstr "儲存鏡頭參數資訊檔案" #: translations/xrc.cpp:323 xrc.cpp:323 -#, fuzzy msgid "Camera" -msgstr "照相機製造商:" +msgstr "照相機" #: translations/xrc.cpp:326 xrc.cpp:326 msgid "Save camera to database" msgstr "" #: translations/xrc.cpp:328 translations/xrc.cpp:367 xrc.cpp:328 xrc.cpp:367 -#, fuzzy msgid "Photos" -msgstr "光學性質" +msgstr "照片" #: translations/xrc.cpp:329 translations/xrc.cpp:369 translations/xrc.cpp:485 #: xrc.cpp:329 xrc.cpp:369 xrc.cpp:485 @@ -4933,12 +4901,11 @@ #: translations/xrc.cpp:338 xrc.cpp:338 msgid "Yes" -msgstr "" +msgstr "是" #: translations/xrc.cpp:339 xrc.cpp:339 -#, fuzzy msgid "No" -msgstr "無" +msgstr "否" #: translations/xrc.cpp:341 translations/xrc.cpp:990 xrc.cpp:341 xrc.cpp:990 msgid "&Undo" @@ -5401,7 +5368,6 @@ msgstr "未被選取的" #: translations/xrc.cpp:482 xrc.cpp:482 -#, fuzzy msgid "Colour" msgstr "顏色" @@ -5638,12 +5604,10 @@ msgstr "全景圖片尺寸" #: translations/xrc.cpp:556 translations/xrc.cpp:635 xrc.cpp:556 xrc.cpp:635 -#, fuzzy msgid "Width:" msgstr "寬度:" #: translations/xrc.cpp:557 translations/xrc.cpp:636 xrc.cpp:557 xrc.cpp:636 -#, fuzzy msgid "Height:" msgstr "高度:" @@ -5981,16 +5945,15 @@ #: translations/xrc.cpp:664 xrc.cpp:664 #, fuzzy msgid "Language:" -msgstr "語言" +msgstr "語言:" #: translations/xrc.cpp:665 xrc.cpp:665 msgid "(requires restarting hugin)" msgstr "(需要重啟動 Hugin)" #: translations/xrc.cpp:666 xrc.cpp:666 -#, fuzzy msgid "Undo:" -msgstr "復原" +msgstr "復原:" #: translations/xrc.cpp:667 xrc.cpp:667 msgid "Skip over visibility toggles" @@ -6486,8 +6449,9 @@ msgstr "光學性質最佳化" #: translations/xrc.cpp:792 xrc.cpp:792 +#, fuzzy msgid "Misc" -msgstr "" +msgstr "雜項" #: translations/xrc.cpp:797 xrc.cpp:797 msgid "Preferences - hugin" |
From: <hug...@li...> - 2013-09-09 17:51:10
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/cf2052881569 changeset: 6282:cf2052881569 user: tmodes date: Thu May 16 22:08:54 2013 +0200 description: Updated Chinese Traditional translation (Rick Langford) diffstat: src/translations/zh_TW.po | 140 +++++++++++++++++---------------------------- 1 files changed, 52 insertions(+), 88 deletions(-) diffs (467 lines): diff -r 20e34581ca6a -r cf2052881569 src/translations/zh_TW.po --- a/src/translations/zh_TW.po Tue May 07 21:56:31 2013 +0200 +++ b/src/translations/zh_TW.po Thu May 16 22:08:54 2013 +0200 @@ -4,15 +4,14 @@ "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2013-02-24 12:50+0100\n" "PO-Revision-Date: \n" -"Last-Translator: Ewing Kang <f03...@ya...>\n" +"Last-Translator: Rick Langford <ru...@ya...>\n" "Language-Team: Chinese Traditional <NA>\n" -"Language: \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Chinese\n" -"X-Poedit-Country: TAIWAN\n" "X-Poedit-Bookmarks: -1,277,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Generator: Poedit 1.5.5\n" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 #, c-format @@ -92,19 +91,16 @@ msgstr "注意" #: hugin1/base_wx/huginConfig.cpp:288 -#, fuzzy msgid "first image" -msgstr "儲存裁剪後的圖片" +msgstr "第一張照片" #: hugin1/base_wx/huginConfig.cpp:289 -#, fuzzy msgid "last image" -msgstr "增加圖片" +msgstr "最後一張照片" #: hugin1/base_wx/huginConfig.cpp:291 -#, fuzzy msgid "directory" -msgstr "偵測器" +msgstr "目錄" #: hugin1/base_wx/huginConfig.cpp:292 hugin1/base_wx/LensTools.cpp:41 #: hugin1/hugin/GLPreviewFrame.cpp:1488 hugin1/hugin/ImagesTree.cpp:370 @@ -113,14 +109,12 @@ msgstr "等距長方圓柱" #: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 -#, fuzzy msgid "Camera maker" -msgstr "照相機製造商:" +msgstr "照相機製造商" #: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 -#, fuzzy msgid "Camera model" -msgstr "照相機型號:" +msgstr "照相機型號" #: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:666 #: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 @@ -130,9 +124,8 @@ msgstr "鏡頭" #: hugin1/base_wx/huginConfig.cpp:335 -#, fuzzy msgid "unknown projection" -msgstr "投影" +msgstr "" #: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 msgid "Normal (rectilinear)" @@ -325,11 +318,11 @@ msgstr "接合時發生錯誤" #: hugin1/base_wx/RunStitchPanel.cpp:371 -#, fuzzy, c-format +#, c-format msgid "" "Error while running assistant\n" "%s" -msgstr "分析 panotools 程式碼時發生錯誤: %s" +msgstr "" #: hugin1/base_wx/RunStitchPanel.cpp:372 hugin1/base_wx/RunStitchPanel.cpp:380 #, fuzzy @@ -520,9 +513,8 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:617 #: hugin1/calibrate_lens/LensCalFrame.cpp:733 -#, fuzzy msgid "Finished" -msgstr "芬蘭文" +msgstr "" #: hugin1/calibrate_lens/LensCalFrame.cpp:633 msgid "" @@ -581,7 +573,7 @@ #: xrc.cpp:276 #, fuzzy msgid "Save lens" -msgstr "儲存鏡頭..." +msgstr "儲存鏡頭" #: hugin1/calibrate_lens/LensCalFrame.cpp:806 hugin1/hugin/MainFrame.cpp:860 msgid "Save project file" @@ -620,9 +612,9 @@ msgstr "使用中的字碼頁: %u" #: hugin1/hugin/AboutDialog.cpp:174 -#, fuzzy, c-format +#, c-format msgid "Version: %s" -msgstr "版本 %s" +msgstr "版本: %s" #: hugin1/hugin/AboutDialog.cpp:175 #, c-format @@ -1561,24 +1553,20 @@ msgstr "鏡頭編號" #: hugin1/hugin/ImagesTree.cpp:142 -#, fuzzy msgid "Width" -msgstr "寬度:" +msgstr "寬度" #: hugin1/hugin/ImagesTree.cpp:142 -#, fuzzy msgid "Image width" -msgstr "圖片尺寸:" +msgstr "圖片寬度" #: hugin1/hugin/ImagesTree.cpp:143 -#, fuzzy msgid "Height" -msgstr "高度:" +msgstr "高度" #: hugin1/hugin/ImagesTree.cpp:143 -#, fuzzy msgid "Image height" -msgstr "圖片修剪" +msgstr "圖片高度" #: hugin1/hugin/ImagesTree.cpp:144 msgid "Anchor" @@ -1620,12 +1608,11 @@ #: hugin1/hugin/ImagesTree.cpp:149 #, fuzzy msgid "Maker" -msgstr "照相機製造商:" +msgstr "製造商:" #: hugin1/hugin/ImagesTree.cpp:150 -#, fuzzy msgid "Model" -msgstr "型號:" +msgstr "型號" #: hugin1/hugin/ImagesTree.cpp:151 #, fuzzy @@ -1642,63 +1629,52 @@ msgstr "" #: hugin1/hugin/ImagesTree.cpp:153 -#, fuzzy msgid "Focal length" -msgstr "焦距:" +msgstr "焦距" #: hugin1/hugin/ImagesTree.cpp:154 -#, fuzzy msgid "Aperture" -msgstr "光圈:" +msgstr "光圈" #: hugin1/hugin/ImagesTree.cpp:155 -#, fuzzy msgid "Shutter Speed" -msgstr "快門速度:" +msgstr "快門速度" #: hugin1/hugin/ImagesTree.cpp:155 -#, fuzzy msgid "Shutter speed" -msgstr "快門速度:" +msgstr "快門速度" #: hugin1/hugin/ImagesTree.cpp:156 -#, fuzzy msgid "ISO" -msgstr "ISO感光度:" +msgstr "ISO" #: hugin1/hugin/ImagesTree.cpp:156 msgid "ISO speed" msgstr "" #: hugin1/hugin/ImagesTree.cpp:158 -#, fuzzy msgid "Yaw (y)" msgstr "橫向角度 (y)" #: hugin1/hugin/ImagesTree.cpp:158 -#, fuzzy msgid "Yaw" -msgstr "橫向角度:" +msgstr "橫向角度" #: hugin1/hugin/ImagesTree.cpp:159 -#, fuzzy msgid "Pitch (p)" msgstr "縱向角度 (p)" #: hugin1/hugin/ImagesTree.cpp:159 -#, fuzzy msgid "Pitch" -msgstr "縱向角度:" +msgstr "縱向角度" #: hugin1/hugin/ImagesTree.cpp:160 -#, fuzzy msgid "Roll (r)" msgstr "旋轉角度 (r)" #: hugin1/hugin/ImagesTree.cpp:160 -#, fuzzy msgid "Roll" -msgstr "旋轉角度:" +msgstr "旋轉角度" #: hugin1/hugin/ImagesTree.cpp:161 #, fuzzy @@ -1822,14 +1798,14 @@ msgstr "線性的" #: hugin1/hugin/ImagesTree.cpp:663 -#, fuzzy, c-format +#, c-format msgid "Lens %d" -msgstr "鏡頭" +msgstr "鏡頭 %d" #: hugin1/hugin/ImagesTree.cpp:666 #, fuzzy, c-format msgid "Stack %d" -msgstr "堆棧:" +msgstr "堆棧圖 %d" #: hugin1/hugin/ImagesTree.cpp:669 #, c-format @@ -2495,7 +2471,6 @@ msgstr "錨定這張圖片以便調整光圈" #: hugin1/hugin/PanoOperation.cpp:438 -#, fuzzy msgid "New lens" msgstr "新鏡頭" @@ -2855,9 +2830,8 @@ msgstr "捷克文" #: hugin1/hugin/PreferencesDialog.cpp:134 -#, fuzzy msgid "Danish" -msgstr "西班牙文" +msgstr "丹麥文" #: hugin1/hugin/PreferencesDialog.cpp:137 msgid "Dutch" @@ -3611,9 +3585,8 @@ msgstr "新增專案 %s 到助手列表中" #: hugin1/ptbatcher/BatchTrayIcon.cpp:81 -#, fuzzy msgid "E&xit" -msgstr "退出 (&x)\tAlt-X" +msgstr "退出 (&x)" #: hugin1/ptbatcher/FindPanoDialog.cpp:195 msgid "" @@ -3640,7 +3613,6 @@ "你仍然要繼續嗎?" #: hugin1/ptbatcher/FindPanoDialog.cpp:240 -#, fuzzy msgid "Stop" msgstr "停止" @@ -3676,9 +3648,8 @@ msgstr "載入圖片 %s" #: hugin1/ptbatcher/FindPanoDialog.cpp:409 translations/xrc.cpp:40 xrc.cpp:40 -#, fuzzy msgid "Start" -msgstr "開始了" +msgstr "開始" #: hugin1/ptbatcher/FindPanoDialog.cpp:415 #, fuzzy, c-format @@ -3961,9 +3932,8 @@ msgstr "" #: translations/xrc.cpp:32 xrc.cpp:32 -#, fuzzy msgid "Directory:" -msgstr "偵測器" +msgstr "目錄:" #: translations/xrc.cpp:33 translations/xrc.cpp:128 translations/xrc.cpp:133 #: translations/xrc.cpp:136 translations/xrc.cpp:141 translations/xrc.cpp:771 @@ -4506,8 +4476,9 @@ msgstr "" #: translations/xrc.cpp:184 xrc.cpp:184 +#, fuzzy msgid "Display" -msgstr "" +msgstr "展示" #: translations/xrc.cpp:185 translations/xrc.cpp:657 xrc.cpp:185 xrc.cpp:657 msgid "General" @@ -4515,7 +4486,7 @@ #: translations/xrc.cpp:186 xrc.cpp:186 msgid "EXIF data" -msgstr "" +msgstr "EXIF 數據" #: translations/xrc.cpp:187 translations/xrc.cpp:222 xrc.cpp:187 xrc.cpp:222 #, fuzzy @@ -4579,8 +4550,9 @@ msgstr "幾何的" #: translations/xrc.cpp:201 translations/xrc.cpp:203 xrc.cpp:201 xrc.cpp:203 +#, fuzzy msgid "Calculate" -msgstr "" +msgstr "計算" #: translations/xrc.cpp:202 xrc.cpp:202 #, fuzzy @@ -4701,9 +4673,8 @@ msgstr "光圈和顏色" #: translations/xrc.cpp:238 xrc.cpp:238 -#, fuzzy msgid "Exposure (Eev):" -msgstr "光圈 (EV)" +msgstr "光圈 (Eev):" #: translations/xrc.cpp:239 xrc.cpp:239 #, fuzzy @@ -4810,13 +4781,11 @@ #: translations/xrc.cpp:288 translations/xrc.cpp:304 translations/xrc.cpp:320 #: xrc.cpp:288 xrc.cpp:304 xrc.cpp:320 -#, fuzzy msgid "Camera maker:" msgstr "照相機製造商:" #: translations/xrc.cpp:289 translations/xrc.cpp:305 translations/xrc.cpp:321 #: xrc.cpp:289 xrc.cpp:305 xrc.cpp:321 -#, fuzzy msgid "Camera model:" msgstr "照相機型號:" @@ -4835,8 +4804,9 @@ msgstr "" #: translations/xrc.cpp:293 xrc.cpp:293 +#, fuzzy msgid "Search" -msgstr "" +msgstr "尋找" #: translations/xrc.cpp:295 translations/xrc.cpp:311 xrc.cpp:295 xrc.cpp:311 msgid "Aperture:" @@ -4899,18 +4869,16 @@ msgstr "儲存鏡頭參數資訊檔案" #: translations/xrc.cpp:323 xrc.cpp:323 -#, fuzzy msgid "Camera" -msgstr "照相機製造商:" +msgstr "照相機" #: translations/xrc.cpp:326 xrc.cpp:326 msgid "Save camera to database" msgstr "" #: translations/xrc.cpp:328 translations/xrc.cpp:367 xrc.cpp:328 xrc.cpp:367 -#, fuzzy msgid "Photos" -msgstr "光學性質" +msgstr "照片" #: translations/xrc.cpp:329 translations/xrc.cpp:369 translations/xrc.cpp:485 #: xrc.cpp:329 xrc.cpp:369 xrc.cpp:485 @@ -4933,12 +4901,11 @@ #: translations/xrc.cpp:338 xrc.cpp:338 msgid "Yes" -msgstr "" +msgstr "是" #: translations/xrc.cpp:339 xrc.cpp:339 -#, fuzzy msgid "No" -msgstr "無" +msgstr "否" #: translations/xrc.cpp:341 translations/xrc.cpp:990 xrc.cpp:341 xrc.cpp:990 msgid "&Undo" @@ -5401,7 +5368,6 @@ msgstr "未被選取的" #: translations/xrc.cpp:482 xrc.cpp:482 -#, fuzzy msgid "Colour" msgstr "顏色" @@ -5638,12 +5604,10 @@ msgstr "全景圖片尺寸" #: translations/xrc.cpp:556 translations/xrc.cpp:635 xrc.cpp:556 xrc.cpp:635 -#, fuzzy msgid "Width:" msgstr "寬度:" #: translations/xrc.cpp:557 translations/xrc.cpp:636 xrc.cpp:557 xrc.cpp:636 -#, fuzzy msgid "Height:" msgstr "高度:" @@ -5981,16 +5945,15 @@ #: translations/xrc.cpp:664 xrc.cpp:664 #, fuzzy msgid "Language:" -msgstr "語言" +msgstr "語言:" #: translations/xrc.cpp:665 xrc.cpp:665 msgid "(requires restarting hugin)" msgstr "(需要重啟動 Hugin)" #: translations/xrc.cpp:666 xrc.cpp:666 -#, fuzzy msgid "Undo:" -msgstr "復原" +msgstr "復原:" #: translations/xrc.cpp:667 xrc.cpp:667 msgid "Skip over visibility toggles" @@ -6486,8 +6449,9 @@ msgstr "光學性質最佳化" #: translations/xrc.cpp:792 xrc.cpp:792 +#, fuzzy msgid "Misc" -msgstr "" +msgstr "雜項" #: translations/xrc.cpp:797 xrc.cpp:797 msgid "Preferences - hugin" |
From: <hug...@li...> - 2013-09-01 07:51:42
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/8fd2dbde3d42 changeset: 6281:8fd2dbde3d42 user: Thomas Pryds <th...@pr...> date: Sun Sep 01 09:50:28 2013 +0200 description: Updated Danish translation diffstat: src/translations/da.po | 3035 ++++++++++++++++++++++++----------------------- 1 files changed, 1521 insertions(+), 1514 deletions(-) diffs (truncated from 6244 to 500 lines): diff -r 20e34581ca6a -r 8fd2dbde3d42 src/translations/da.po --- a/src/translations/da.po Tue May 07 21:56:31 2013 +0200 +++ b/src/translations/da.po Sun Sep 01 09:50:28 2013 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: da\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2013-02-24 12:50+0100\n" -"PO-Revision-Date: 2013-03-27 22:39+0100\n" +"POT-Creation-Date: 2013-09-01 09:16+0200\n" +"PO-Revision-Date: 2013-09-01 09:30+0200\n" "Last-Translator: Thomas Pryds <th...@pr...>\n" "Language-Team: Danish <da...@li...>\n" "Language: da\n" @@ -18,48 +18,229 @@ "Plural-Forms: \n" "X-Generator: Lokalize 1.5\n" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 +#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:369 +msgid "Normal (rectilinear)" +msgstr "Normal (retliniet)" + +#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesTree.cpp:370 +msgid "Panoramic (cylindrical)" +msgstr "Panoramisk (cylindrisk)" + +#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:371 +msgid "Circular fisheye" +msgstr "Cirkulært fiskeøje" + +#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:372 +msgid "Full frame fisheye" +msgstr "Full-frame fiskeøje" + +#: hugin1/base_wx/LensTools.cpp:41 hugin1/base_wx/huginConfig.cpp:292 +#: hugin1/hugin/GLPreviewFrame.cpp:1495 hugin1/hugin/ImagesTree.cpp:373 +#: hugin1/hugin/PreviewFrame.cpp:631 +msgid "Equirectangular" +msgstr "Ækvirektangulært" + +#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:374 +#: hugin1/hugin/PanoPanel.cpp:153 +msgid "Orthographic" +msgstr "Ortografisk" + +#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesTree.cpp:375 +#: hugin1/hugin/PanoPanel.cpp:143 +msgid "Stereographic" +msgstr "Stereografisk" + +#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesTree.cpp:376 +#: hugin1/hugin/PanoPanel.cpp:154 +msgid "Equisolid" +msgstr "Ækvisolid" + +#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:377 +msgid "Fisheye Thoby" +msgstr "Fiskeøje-Thoby" + +#: hugin1/base_wx/LensTools.cpp:219 +msgid "Load lens parameters" +msgstr "Indlæs objektivparametre" + +#: hugin1/base_wx/LensTools.cpp:221 +msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*" +msgstr "Objektivprojektfiler (*.ini)|*.ini|Alle filer (*.*)|*.*" + +#: hugin1/base_wx/LensTools.cpp:242 +msgid "" +"Incompatible lens parameter file, image sizes do not match\n" +"Apply settings anyway?" +msgstr "" +"Inkompatibel objektivparameterfil, billedstørrelser matcher ikke\n" +"Benyt indstillinger alligevel?" + +#: hugin1/base_wx/LensTools.cpp:242 +msgid "Error loading lens parameters" +msgstr "Fejl under indlæsning af objektivparametre" + +#: hugin1/base_wx/LensTools.cpp:345 hugin1/calibrate_lens/LensCalFrame.cpp:739 +msgid "Save lens parameters file" +msgstr "Gem fil med objektivparametre" + +#: hugin1/base_wx/LensTools.cpp:347 hugin1/calibrate_lens/LensCalFrame.cpp:741 +msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" +msgstr "Objektivprojektfil (*.ini)|*.ini|Alle filer (*)|*" + +#: hugin1/base_wx/LensTools.cpp:363 +msgid "Please select an image and try again" +msgstr "Vælg venligst et billede og prøv igen" + +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160 #, c-format -msgid "" -"External program %s not found as specified in preferences, reverting to " -"bundled version" -msgstr "" -"Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i " -"stedet versionen i programpakken" - -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57 -#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82 -#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 +msgid "Failed to kill process %ld, error %d: %s" +msgstr "Det lykkedes ikke at afslutte proces %ld, fejl %d: %s" + +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179 +#, c-format +msgid "Error pausing process %ld, code 1" +msgstr "Fejl under pausning af proces %ld, kode 1" + +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196 +#, c-format +msgid "Error pausing process %ld, code 2" +msgstr "Fejl under pausning af proces %ld, kode 1" + +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 +#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:170 +#: translations/xrc.cpp:218 translations/xrc.cpp:255 translations/xrc.cpp:304 +#: translations/xrc.cpp:320 translations/xrc.cpp:327 translations/xrc.cpp:508 +#: translations/xrc.cpp:541 translations/xrc.cpp:545 translations/xrc.cpp:549 +#: translations/xrc.cpp:632 translations/xrc.cpp:657 translations/xrc.cpp:800 +#: translations/xrc.cpp:825 translations/xrc.cpp:1054 +msgid "Cancel" +msgstr "Annullér" + +#: hugin1/base_wx/MyExternalCmdExecDialog.h:189 +msgid "Command Line Progress" +msgstr "Kommandolinie-fremgang" + +#: hugin1/base_wx/MyProgressDialog.cpp:36 +msgid "Elapsed time : " +msgstr "Forløben tid:" + +#: hugin1/base_wx/MyProgressDialog.h:102 +msgid "Optimizing Panorama" +msgstr "Optimerer Panorama" + +#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 +#: hugin1/base_wx/PTWXDlg.cpp:122 +msgid "Panorama Tools" +msgstr "Panorama Tools" + +#: hugin1/base_wx/RunStitchPanel.cpp:111 hugin1/base_wx/huginConfig.cpp:57 +#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/platform.cpp:131 +#: hugin1/hugin/MainFrame.cpp:1516 hugin1/hugin/MainFrame.cpp:2306 +#: hugin1/hugin/PanoPanel.cpp:1187 +#, c-format +msgid "External program %s not found in the bundle, reverting to system path" +msgstr "" +"Eksternt program %s blev ikke fundet i programpakken; bruger i stedet " +"systemsti" + +#: hugin1/base_wx/RunStitchPanel.cpp:111 hugin1/base_wx/huginConfig.cpp:47 +#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69 +#: hugin1/base_wx/huginConfig.cpp:82 hugin1/base_wx/platform.cpp:131 #: hugin1/base_wx/wxLensDB.cpp:751 hugin1/base_wx/wxLensDB.cpp:764 #: hugin1/base_wx/wxLensDB.cpp:810 hugin1/base_wx/wxLensDB.cpp:817 #: hugin1/base_wx/wxLensDB.cpp:822 hugin1/base_wx/wxLensDB.cpp:969 #: hugin1/calibrate_lens/LensCalFrame.cpp:401 -#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:287 -#: hugin1/hugin/GLViewer.cpp:299 hugin1/hugin/MainFrame.cpp:841 -#: hugin1/hugin/MainFrame.cpp:1470 hugin1/hugin/MainFrame.cpp:1518 -#: hugin1/hugin/MainFrame.cpp:2008 hugin1/hugin/MainFrame.cpp:2195 -#: hugin1/hugin/MainFrame.cpp:2267 hugin1/hugin/MainFrame.cpp:2305 -#: hugin1/hugin/MainFrame.cpp:2317 hugin1/hugin/MainFrame.cpp:2332 -#: hugin1/hugin/MainFrame.cpp:2340 +#: hugin1/hugin/CPEditorPanel.cpp:1699 hugin1/hugin/GLViewer.cpp:287 +#: hugin1/hugin/GLViewer.cpp:299 hugin1/hugin/MainFrame.cpp:839 +#: hugin1/hugin/MainFrame.cpp:1468 hugin1/hugin/MainFrame.cpp:1516 +#: hugin1/hugin/MainFrame.cpp:2006 hugin1/hugin/MainFrame.cpp:2196 +#: hugin1/hugin/MainFrame.cpp:2268 hugin1/hugin/MainFrame.cpp:2306 +#: hugin1/hugin/MainFrame.cpp:2318 hugin1/hugin/MainFrame.cpp:2333 +#: hugin1/hugin/MainFrame.cpp:2341 #: hugin1/hugin/OptimizePhotometricPanel.cpp:277 #: hugin1/hugin/OptimizePhotometricPanel.cpp:306 -#: hugin1/hugin/PanoOperation.cpp:529 hugin1/hugin/PanoPanel.cpp:1015 -#: hugin1/hugin/PanoPanel.cpp:1186 hugin1/icpfind/AutoCtrlPointCreator.cpp:246 +#: hugin1/hugin/PanoOperation.cpp:531 hugin1/hugin/PanoPanel.cpp:1016 +#: hugin1/hugin/PanoPanel.cpp:1187 hugin1/icpfind/AutoCtrlPointCreator.cpp:246 #: hugin1/ptbatcher/FindPanoDialog.cpp:293 #: hugin1/ptbatcher/ProjectListBox.cpp:184 #: hugin1/stitch_project/hugin_stitch_project.cpp:411 msgid "Error" msgstr "Fejl" -#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69 -#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/hugin/MainFrame.cpp:1518 hugin1/hugin/MainFrame.cpp:2305 -#: hugin1/hugin/PanoPanel.cpp:1186 +#: hugin1/base_wx/RunStitchPanel.cpp:141 hugin1/base_wx/RunStitchPanel.cpp:310 +msgid "Could not open project file:" +msgstr "Kunne ikke åbne projektfil:" + +#: hugin1/base_wx/RunStitchPanel.cpp:151 hugin1/base_wx/RunStitchPanel.cpp:318 +#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:91 #, c-format -msgid "External program %s not found in the bundle, reverting to system path" -msgstr "" -"Eksternt program %s blev ikke fundet i programpakken; bruger i stedet " -"systemsti" +msgid "could not open script : %s" +msgstr "kunne ikke åbne script: %s" + +#: hugin1/base_wx/RunStitchPanel.cpp:172 hugin1/base_wx/RunStitchPanel.cpp:326 +#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:128 +#, c-format +msgid "error while parsing panotools script: %s" +msgstr "fejl under tolkning af panotools script: %s" + +#: hugin1/base_wx/RunStitchPanel.cpp:216 hugin1/base_wx/RunStitchPanel.cpp:233 +#: hugin1/base_wx/RunStitchPanel.cpp:352 +msgid "Could not create temporary file" +msgstr "Kunne ikke oprette midlertidig fil" + +#: hugin1/base_wx/RunStitchPanel.cpp:273 +msgid "" +"Overwrite existing images?\n" +"\n" +msgstr "" +"Overskriv eksisterende billedfiler?\n" +"\n" + +#: hugin1/base_wx/RunStitchPanel.cpp:273 +msgid "Overwrite existing images" +msgstr "Overskriv eksisterende billedfiler?" + +#: hugin1/base_wx/RunStitchPanel.cpp:288 +#, c-format +msgid "Stitching %s" +msgstr "Sammenføjer %s" + +#: hugin1/base_wx/RunStitchPanel.cpp:292 +#, c-format +msgid "" +"Error while stitching project\n" +"%s" +msgstr "" +"Fejl under sammenføjning af projekt\n" +"%s" + +#: hugin1/base_wx/RunStitchPanel.cpp:293 hugin1/base_wx/RunStitchPanel.cpp:299 +#: hugin1/stitch_project/hugin_stitch_project.cpp:177 +msgid "Error during stitching" +msgstr "Fejl under sammenføjning" + +#: hugin1/base_wx/RunStitchPanel.cpp:371 +#, c-format +msgid "" +"Error while running assistant\n" +"%s" +msgstr "" +"Fejl under kørsel af assistent\n" +"%s" + +#: hugin1/base_wx/RunStitchPanel.cpp:372 hugin1/base_wx/RunStitchPanel.cpp:380 +msgid "Error during running assistant" +msgstr "Fejl under kørsel af assistent" + +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 +#, c-format +msgid "" +"External program %s not found as specified in preferences, reverting to " +"bundled version" +msgstr "" +"Eksternt program %s blev ikke fundet som angivet i indstillingerne; bruger i " +"stedet versionen i programpakken" #: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109 #, c-format @@ -89,15 +270,14 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:776 #: hugin1/calibrate_lens/LensCalFrame.cpp:802 #: hugin1/calibrate_lens/LensCalFrame.cpp:874 -#: hugin1/hugin/CPDetectorDialog.cpp:121 hugin1/hugin/GLPreviewFrame.cpp:1585 -#: hugin1/hugin/GLPreviewFrame.cpp:1592 hugin1/hugin/GLPreviewFrame.cpp:1599 -#: hugin1/hugin/GLPreviewFrame.cpp:1613 hugin1/hugin/GLPreviewFrame.cpp:1620 -#: hugin1/hugin/GLPreviewFrame.cpp:1627 hugin1/hugin/MainFrame.cpp:837 -#: hugin1/hugin/MainFrame.cpp:1719 hugin1/hugin/MainFrame.cpp:2271 -#: hugin1/hugin/MaskEditorPanel.cpp:532 hugin1/hugin/PreferencesDialog.cpp:857 +#: hugin1/hugin/CPDetectorDialog.cpp:121 hugin1/hugin/GLPreviewFrame.cpp:1592 +#: hugin1/hugin/GLPreviewFrame.cpp:1599 hugin1/hugin/GLPreviewFrame.cpp:1606 +#: hugin1/hugin/GLPreviewFrame.cpp:1620 hugin1/hugin/GLPreviewFrame.cpp:1627 +#: hugin1/hugin/GLPreviewFrame.cpp:1634 hugin1/hugin/MainFrame.cpp:835 +#: hugin1/hugin/MainFrame.cpp:1717 hugin1/hugin/MainFrame.cpp:2272 +#: hugin1/hugin/MaskEditorPanel.cpp:479 hugin1/hugin/PreferencesDialog.cpp:863 #: hugin1/ptbatcher/FindPanoDialog.cpp:250 #: hugin1/ptbatcher/FindPanoDialog.cpp:271 translations/xrc.cpp:174 -#: xrc.cpp:174 msgid "Warning" msgstr "Advarsel" @@ -113,12 +293,6 @@ msgid "directory" msgstr "mappe" -#: hugin1/base_wx/huginConfig.cpp:292 hugin1/base_wx/LensTools.cpp:41 -#: hugin1/hugin/GLPreviewFrame.cpp:1488 hugin1/hugin/ImagesTree.cpp:370 -#: hugin1/hugin/PreviewFrame.cpp:630 -msgid "Equirectangular" -msgstr "Ækvirektangulært" - #: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 msgid "Camera maker" msgstr "Kameraproducent" @@ -128,9 +302,9 @@ msgstr "Kameramodel" #: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 -#: translations/xrc.cpp:223 translations/xrc.cpp:236 translations/xrc.cpp:300 -#: translations/xrc.cpp:316 xrc.cpp:223 xrc.cpp:236 xrc.cpp:300 xrc.cpp:316 +#: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1211 +#: translations/xrc.cpp:189 translations/xrc.cpp:202 translations/xrc.cpp:302 +#: translations/xrc.cpp:318 msgid "Lens" msgstr "Objektiv" @@ -138,114 +312,6 @@ msgid "unknown projection" msgstr "ukendt projektion" -#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 -msgid "Normal (rectilinear)" -msgstr "Normal (retliniet)" - -#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesTree.cpp:367 -msgid "Panoramic (cylindrical)" -msgstr "Panoramisk (cylindrisk)" - -#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:368 -msgid "Circular fisheye" -msgstr "Cirkulært fiskeøje" - -#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:369 -msgid "Full frame fisheye" -msgstr "Full-frame fiskeøje" - -#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:371 -#: hugin1/hugin/PanoPanel.cpp:153 -msgid "Orthographic" -msgstr "Ortografisk" - -#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesTree.cpp:372 -#: hugin1/hugin/PanoPanel.cpp:143 -msgid "Stereographic" -msgstr "Stereografisk" - -#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesTree.cpp:373 -#: hugin1/hugin/PanoPanel.cpp:154 -msgid "Equisolid" -msgstr "Ækvisolid" - -#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:374 -msgid "Fisheye Thoby" -msgstr "Fiskeøje-Thoby" - -#: hugin1/base_wx/LensTools.cpp:219 -msgid "Load lens parameters" -msgstr "Indlæs objektivparametre" - -#: hugin1/base_wx/LensTools.cpp:221 -msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*" -msgstr "Objektivprojektfiler (*.ini)|*.ini|Alle filer (*.*)|*.*" - -#: hugin1/base_wx/LensTools.cpp:242 -msgid "" -"Incompatible lens parameter file, image sizes do not match\n" -"Apply settings anyway?" -msgstr "" -"Inkompatibel objektivparameterfil, billedstørrelser matcher ikke\n" -"Benyt indstillinger alligevel?" - -#: hugin1/base_wx/LensTools.cpp:242 -msgid "Error loading lens parameters" -msgstr "Fejl under indlæsning af objektivparametre" - -#: hugin1/base_wx/LensTools.cpp:345 hugin1/calibrate_lens/LensCalFrame.cpp:739 -msgid "Save lens parameters file" -msgstr "Gem fil med objektivparametre" - -#: hugin1/base_wx/LensTools.cpp:347 hugin1/calibrate_lens/LensCalFrame.cpp:741 -msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" -msgstr "Objektivprojektfil (*.ini)|*.ini|Alle filer (*)|*" - -#: hugin1/base_wx/LensTools.cpp:363 -msgid "Please select an image and try again" -msgstr "Vælg venligst et billede og prøv igen" - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160 -#, c-format -msgid "Failed to kill process %ld, error %d: %s" -msgstr "Det lykkedes ikke at afslutte proces %ld, fejl %d: %s" - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179 -#, c-format -msgid "Error pausing process %ld, code 1" -msgstr "Fejl under pausning af proces %ld, kode 1" - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196 -#, c-format -msgid "Error pausing process %ld, code 2" -msgstr "Fejl under pausning af proces %ld, kode 1" - -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 -#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:147 -#: translations/xrc.cpp:213 translations/xrc.cpp:252 translations/xrc.cpp:302 -#: translations/xrc.cpp:318 translations/xrc.cpp:325 translations/xrc.cpp:506 -#: translations/xrc.cpp:539 translations/xrc.cpp:543 translations/xrc.cpp:547 -#: translations/xrc.cpp:630 translations/xrc.cpp:655 translations/xrc.cpp:795 -#: translations/xrc.cpp:820 translations/xrc.cpp:1048 xrc.cpp:147 xrc.cpp:213 -#: xrc.cpp:252 xrc.cpp:302 xrc.cpp:318 xrc.cpp:325 xrc.cpp:506 xrc.cpp:539 -#: xrc.cpp:543 xrc.cpp:547 xrc.cpp:630 xrc.cpp:655 xrc.cpp:795 xrc.cpp:820 -#: xrc.cpp:1048 -msgid "Cancel" -msgstr "Annullér" - -#: hugin1/base_wx/MyExternalCmdExecDialog.h:189 -msgid "Command Line Progress" -msgstr "Kommandolinie-fremgang" - -#: hugin1/base_wx/MyProgressDialog.cpp:36 -msgid "Elapsed time : " -msgstr "Forløben tid:" - -#: hugin1/base_wx/MyProgressDialog.h:102 -msgid "Optimizing Panorama" -msgstr "Optimerer Panorama" - #: hugin1/base_wx/platform.cpp:431 #, c-format msgid "" @@ -270,85 +336,14 @@ "tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*." "hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*" -#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 -#: hugin1/base_wx/PTWXDlg.cpp:122 -msgid "Panorama Tools" -msgstr "Panorama Tools" - -#: hugin1/base_wx/RunStitchPanel.cpp:141 hugin1/base_wx/RunStitchPanel.cpp:310 -msgid "Could not open project file:" -msgstr "Kunne ikke åbne projektfil:" - -#: hugin1/base_wx/RunStitchPanel.cpp:151 hugin1/base_wx/RunStitchPanel.cpp:318 -#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:91 -#, c-format -msgid "could not open script : %s" -msgstr "kunne ikke åbne script: %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:172 hugin1/base_wx/RunStitchPanel.cpp:326 -#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:128 -#, c-format -msgid "error while parsing panotools script: %s" -msgstr "fejl under tolkning af panotools script: %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:216 hugin1/base_wx/RunStitchPanel.cpp:233 -#: hugin1/base_wx/RunStitchPanel.cpp:352 -msgid "Could not create temporary file" -msgstr "Kunne ikke oprette midlertidig fil" - -#: hugin1/base_wx/RunStitchPanel.cpp:273 -msgid "" -"Overwrite existing images?\n" -"\n" -msgstr "" -"Overskriv eksisterende billedfiler?\n" -"\n" - -#: hugin1/base_wx/RunStitchPanel.cpp:273 -msgid "Overwrite existing images" -msgstr "Overskriv eksisterende billedfiler?" - -#: hugin1/base_wx/RunStitchPanel.cpp:288 -#, c-format -msgid "Stitching %s" -msgstr "Sammenføjer %s" - -#: hugin1/base_wx/RunStitchPanel.cpp:292 -#, c-format -msgid "" -"Error while stitching project\n" -"%s" -msgstr "" -"Fejl under sammenføjning af projekt\n" -"%s" - -#: hugin1/base_wx/RunStitchPanel.cpp:293 hugin1/base_wx/RunStitchPanel.cpp:299 -#: hugin1/stitch_project/hugin_stitch_project.cpp:177 -msgid "Error during stitching" -msgstr "Fejl under sammenføjning" - -#: hugin1/base_wx/RunStitchPanel.cpp:371 -#, c-format -msgid "" -"Error while running assistant\n" |
From: <hug...@li...> - 2013-05-07 20:01:16
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/f6fff45d5eac changeset: 6280:f6fff45d5eac user: tmodes date: Tue May 07 21:56:31 2013 +0200 description: Fixes crash with uninitialized variables diffstat: src/hugin1/hugin/PanoOutputDialog.cpp | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 9928ad3bd989 -r f6fff45d5eac src/hugin1/hugin/PanoOutputDialog.cpp --- a/src/hugin1/hugin/PanoOutputDialog.cpp Tue Apr 09 20:58:03 2013 +0200 +++ b/src/hugin1/hugin/PanoOutputDialog.cpp Tue May 07 21:56:31 2013 +0200 @@ -44,7 +44,7 @@ EVT_SPINCTRL(XRCID("output_height"), PanoOutputDialog::OnHeightChanged) END_EVENT_TABLE() -PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano) +PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano), m_aspect(0) { // load our children. some children might need special // initialization. this will be done later. @@ -376,10 +376,16 @@ void PanoOutputDialog::OnWidthChanged(wxSpinEvent & e) { - m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + if(m_aspect>0) + { + m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + }; }; void PanoOutputDialog::OnHeightChanged(wxSpinEvent & e) { - m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + if(m_aspect>0) + { + m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + }; }; |
From: <hug...@li...> - 2013-05-07 20:01:16
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/20e34581ca6a changeset: 6279:20e34581ca6a user: tmodes date: Tue May 07 21:56:31 2013 +0200 description: Fixes crash with uninitialized variables diffstat: src/hugin1/hugin/PanoOutputDialog.cpp | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 8d1a8e19bc69 -r 20e34581ca6a src/hugin1/hugin/PanoOutputDialog.cpp --- a/src/hugin1/hugin/PanoOutputDialog.cpp Sun May 05 09:06:54 2013 +0200 +++ b/src/hugin1/hugin/PanoOutputDialog.cpp Tue May 07 21:56:31 2013 +0200 @@ -44,7 +44,7 @@ EVT_SPINCTRL(XRCID("output_height"), PanoOutputDialog::OnHeightChanged) END_EVENT_TABLE() -PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano) +PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano), m_aspect(0) { // load our children. some children might need special // initialization. this will be done later. @@ -376,10 +376,16 @@ void PanoOutputDialog::OnWidthChanged(wxSpinEvent & e) { - m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + if(m_aspect>0) + { + m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + }; }; void PanoOutputDialog::OnHeightChanged(wxSpinEvent & e) { - m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + if(m_aspect>0) + { + m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + }; }; |