Hugin

Revision: 5046
          http://hugin.svn.sourceforge.net/hugin/?rev=5046&view=rev
Author:   brunopostle
Date:     2010-03-02 23:41:23 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Update authors.txt (Stephen Bennett)

Modified Paths:
--------------
    hugin/trunk/authors.txt

Modified: hugin/trunk/authors.txt
===================================================================
--- hugin/trunk/authors.txt	2010-03-02 23:15:12 UTC (rev 5045)
+++ hugin/trunk/authors.txt	2010-03-02 23:41:23 UTC (rev 5046)
@@ -64,3 +64,4 @@
 Ulf Wilhelmson	original Swedish translation
 Douglas Wilkins	packaging, translation, bugfixes
 Ziv Yaniv	RanSaC code
+Stephen Bennett	show points patch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5045
          http://hugin.svn.sourceforge.net/hugin/?rev=5045&view=rev
Author:   brunopostle
Date:     2010-03-02 23:15:12 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Update ChangeLog

Modified Paths:
--------------
    hugin/releases/2010.0/ChangeLog

Modified: hugin/releases/2010.0/ChangeLog
===================================================================
--- hugin/releases/2010.0/ChangeLog	2010-03-02 23:14:49 UTC (rev 5044)
+++ hugin/releases/2010.0/ChangeLog	2010-03-02 23:15:12 UTC (rev 5045)
@@ -1,5 +1,65 @@
+2010-03-01  harryvanderwolf
+
+	* [r5040] src/hugin1/hugin/GLViewer.cpp: merge trunk /5039 (Harry van
+	  der Wolf) [OSX] Fix cmake compilation Hugin on OSX (patch from Dave
+	  Tow)
+
+2010-02-28  brunopostle
+
+	* [r5035] src/hugin1/hugin/wxPanoCommand.cpp: merge trunk -r 5028
+	  [2889525] Reject control ponits with coordinates less than zero
+	  (Gerry Patterson)
+	* [r5034] src/hugin1/hugin/PanoPanel.cpp: merge trunk -r 5027 Set
+	  blender and fusion options to default value when user entered an
+	  empty string (Thomas Modes)
+	* [r5033] src/translations/zh_TW.po: Chinese Traditional update (Rick
+	  Langford)
+
+2010-02-24  brunopostle
+
+	* [r5026] src/hugin_base/panodata/PanoramaOptions.h: merge trunk -r
+	  5022 Initalise PanoramaOptions::outputLDRExposureLayersFused to
+	  false to prevent random behviour. Found with valgrind (James Legg)
+	* [r5025] src/hugin1/hugin/huginApp.cpp: merge trunk -r 5024 Make
+	  `hugin *.jpg` work (Alexandre Duret-Lutz)
+
+2010-02-23  brunopostle
+
+	* [r5021] platforms/windows/smartblend-wrapper/smartblend-hugin.bat:
+	  merge trunk -r 5020 (Bart Van Andel)
+	* [r5019]
+	  platforms/windows/smartblend-wrapper/smartblend-hugin-windows-readme.txt,
+	  platforms/windows/smartblend-wrapper/smartblend-hugin.bat: Merge
+	  trunk -r 5015 update to smartblend wrapper (Bart van Andel)
+	* [r5018] src/hugin1/hugin/PreferencesDialog.cpp,
+	  src/translations/fi.po: Add Finnish translation from trunk (Juha
+	  Helminen)
+	* [r5017] src/translations/hu.po, src/translations/pl.po: Merge Polish
+	  and Hungarian translation updates from trunk
+
+2010-02-22  brunopostle
+
+	* [r5011] authors.txt: Copy some names from ChangeLog to authors.txt
+
+2010-02-18  tmodes
+
+	* [r4991] src/hugin1/hugin/wxPanoCommand.cpp: Set response type to
+	  linear when adding hdr images
+
+2010-02-08  brunopostle
+
+	* [r4970] src/hugin_base/panodata/PanoramaOptions.cpp: merge trunk -r
+	  4956 Write projection parameters also for PTStitcher script (Thomas
+	  Modes)
+
+2010-02-07  brunopostle
+
+	* [r4969] src/translations/de.po, src/translations/it.po,
+	  src/translations/nl.po: Merge translation updates from trunk
+
 2010-02-02  brunopostle
 
+	* [r4962] ChangeLog: Update ChangeLog
 	* [r4958]
 	  src/hugin1/hugin/xrc/data/help_en_EN/180px-LagardePont-fish.jpg,
 	  src/hugin1/hugin/xrc/data/help_en_EN/220px-Ben_Equirectangular_panini.jpg,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5044
          http://hugin.svn.sourceforge.net/hugin/?rev=5044&view=rev
Author:   brunopostle
Date:     2010-03-02 23:14:49 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Update 2010.0.0 ChangeLog

Modified Paths:
--------------
    htdocs/releases/2010.0.0/ChangeLog

Modified: htdocs/releases/2010.0.0/ChangeLog
===================================================================
--- htdocs/releases/2010.0.0/ChangeLog	2010-03-02 22:21:53 UTC (rev 5043)
+++ htdocs/releases/2010.0.0/ChangeLog	2010-03-02 23:14:49 UTC (rev 5044)
@@ -1,5 +1,65 @@
+2010-03-01  harryvanderwolf
+
+	* [r5040] src/hugin1/hugin/GLViewer.cpp: merge trunk /5039 (Harry van
+	  der Wolf) [OSX] Fix cmake compilation Hugin on OSX (patch from Dave
+	  Tow)
+
+2010-02-28  brunopostle
+
+	* [r5035] src/hugin1/hugin/wxPanoCommand.cpp: merge trunk -r 5028
+	  [2889525] Reject control ponits with coordinates less than zero
+	  (Gerry Patterson)
+	* [r5034] src/hugin1/hugin/PanoPanel.cpp: merge trunk -r 5027 Set
+	  blender and fusion options to default value when user entered an
+	  empty string (Thomas Modes)
+	* [r5033] src/translations/zh_TW.po: Chinese Traditional update (Rick
+	  Langford)
+
+2010-02-24  brunopostle
+
+	* [r5026] src/hugin_base/panodata/PanoramaOptions.h: merge trunk -r
+	  5022 Initalise PanoramaOptions::outputLDRExposureLayersFused to
+	  false to prevent random behviour. Found with valgrind (James Legg)
+	* [r5025] src/hugin1/hugin/huginApp.cpp: merge trunk -r 5024 Make
+	  `hugin *.jpg` work (Alexandre Duret-Lutz)
+
+2010-02-23  brunopostle
+
+	* [r5021] platforms/windows/smartblend-wrapper/smartblend-hugin.bat:
+	  merge trunk -r 5020 (Bart Van Andel)
+	* [r5019]
+	  platforms/windows/smartblend-wrapper/smartblend-hugin-windows-readme.txt,
+	  platforms/windows/smartblend-wrapper/smartblend-hugin.bat: Merge
+	  trunk -r 5015 update to smartblend wrapper (Bart van Andel)
+	* [r5018] src/hugin1/hugin/PreferencesDialog.cpp,
+	  src/translations/fi.po: Add Finnish translation from trunk (Juha
+	  Helminen)
+	* [r5017] src/translations/hu.po, src/translations/pl.po: Merge Polish
+	  and Hungarian translation updates from trunk
+
+2010-02-22  brunopostle
+
+	* [r5011] authors.txt: Copy some names from ChangeLog to authors.txt
+
+2010-02-18  tmodes
+
+	* [r4991] src/hugin1/hugin/wxPanoCommand.cpp: Set response type to
+	  linear when adding hdr images
+
+2010-02-08  brunopostle
+
+	* [r4970] src/hugin_base/panodata/PanoramaOptions.cpp: merge trunk -r
+	  4956 Write projection parameters also for PTStitcher script (Thomas
+	  Modes)
+
+2010-02-07  brunopostle
+
+	* [r4969] src/translations/de.po, src/translations/it.po,
+	  src/translations/nl.po: Merge translation updates from trunk
+
 2010-02-02  brunopostle
 
+	* [r4962] ChangeLog: Update ChangeLog
 	* [r4958]
 	  src/hugin1/hugin/xrc/data/help_en_EN/180px-LagardePont-fish.jpg,
 	  src/hugin1/hugin/xrc/data/help_en_EN/220px-Ben_Equirectangular_panini.jpg,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5043
          http://hugin.svn.sourceforge.net/hugin/?rev=5043&view=rev
Author:   brunopostle
Date:     2010-03-02 22:21:53 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Release notes mostly finished

Modified Paths:
--------------
    htdocs/releases/2010.0.0/en.shtml

Modified: htdocs/releases/2010.0.0/en.shtml
===================================================================
--- htdocs/releases/2010.0.0/en.shtml	2010-03-02 21:54:58 UTC (rev 5042)
+++ htdocs/releases/2010.0.0/en.shtml	2010-03-02 22:21:53 UTC (rev 5043)
@@ -35,87 +35,51 @@
 the view.</p>
 
 <p>Now these tools have been overhauled to make them easier to find, to get a
-bigger panorama canvas, and to make create space for extra parameters and new
-features in the pipeline such as the upcoming <em>Layout mode</em>.  Switching
-'modes' is more intuitive, with a tab for each that shows just the 'actions'
-relevant to that mode, hitting <em>&lt;F11&gt;</em> goes full-screen to release
-more space for the preview canvas itself.</p>
+bigger panorama canvas, and to create space for new features in the pipeline
+such as the upcoming <em>Layout mode</em>. Switching 'modes' is more intuitive,
+with a tab for each that shows just the 'actions' relevant to that mode, the
+&lt;F11&gt; key enables full-screen viewing of the preview.</p>
 
-<p>The Hugin main window can now also go full-screen <em>&lt;F11&gt;</em>,
-useful for manually editing control points.</p>
+<p>There are other usability-related changes; the <em>Hugin main window</em>
+can also be viewed full-screen with &lt;F11&gt;; more photo EXIF metadata is
+displayed in the Images tab; a list of recent projects is available in the
+<em>File menu</em>; plus there has been a general clean-up of text in the GUI
+and a number of updates to the manual.</p>
 
 <h3>Autocrop</h3>
 
 <p>Hugin is great for stitching hand-held panoramas, but these need careful
-cropping to ensure the entire canvas is filled and there are no missing bits.
-The <em>Fast Preview window</em> now has an <em>Autocrop</em> button that does
-all this for you automatically - Just click and the crop rectangle will be
-resized to use the maximum possible area covered by your photos.</p>
+cropping to produce a picture with 100% coverage. The <em>Fast Preview
+window</em> now has an <em>Autocrop</em> button that does all this for you
+automatically - Just click and the crop rectangle will be resized to use the
+largest possible area covered by your photos.</p>
 
 <h3>Deghosting</h3>
 
-Merged gsoc2009_deghosting branch.
-Added options for hugin_hdrmerge to GUI
-<p></p>
+<p>One of the advanced Hugin features is to merge bracketed photos using
+<em>exposure fusion</em> or <em>HDR merging</em> - This is done automatically
+when stitching as necessary.</p>
 
+<p>When people or objects move during a bracketed sequence, 'ghosts' appear in
+the result. Another Summer of Code project has now been integrated that both
+enables <em>HDR deghosting</em> in the GUI and provides an experimental
+<em>deghosting_mask</em> tool for <em>exposure fusion</em> deghosting with
+enfuse.</p>
+
 <h3>Languages</h3>
 
-<p>The Hugin application is translated into twenty languages, most of these
-translations have been updated for this release.</p>
+<p>With the addition of Finnish, the Hugin application is now translated into
+twenty-one languages, most of the translations have been updated for this
+release.</p>
 
 <h3>Other improvements</h3>
 
-	  Update manual to approximately 2010.0.0 level
+<p>This release also has the usual incremental improvements: The default size
+of the image cache has increased in line with modern computers, so existing
+Hugin users may want to check or reset their <em>Preferences</em> to suit, the
+<em>About dialog</em> has been extended to show a full list of Hugin
+contributors, and there have been many fixes for minor bugs and annoyances.</p>
 
-	  Fix storage of image cache upperbound.  Patch by Ryan Sleevi.
-
-	  Raise default image cache size from 75MB to 256MB
-
-	  Fixes update of preview window when projection parameter changed
-
-	  Merge trunk -r 4902. Fixes makefile export on OS X. Thanks to Robert
-	  Hart for the fix (see bug #2933781)
-
-	  Unified progress boxes
-
-	  Fixes crash on startup when loading a project without cp [2867671]
-
-	  cpclean: don't die if there are no control points
-
-          Capitalisation and punctuation fixes
-
-	  Images Panel: use Camera {Maker,Model} instead of Maker/Model
-	  We have screen space available, so no need to save on these.
-
-	  celeste_standalone now returns 0 on
-	  success instead of 1
-	  Fix c line parsing for
-	  celeste_standalone (Felix Hagemann)
-
-	  Clean up cp detector code and extended check for existence
-
-	  expanded AboutDialog,
-	  currently still toying with the different possibilities.
-	  the new Dialog has a tabbed layout. Some tabs read text directly
-	  from files
-	  (e.g. License). Others display HTML. The Author's HTML tab is
-	  generated at
-	  build time by CMake from the tabulated list in authors.txt
-
-	  more convenient placement of fwd/back buttons on control point tab
-
-	  Added most recently used project files to Files menu
-
-	  Improved Numeric Transform Dialog
-
-<!--p>This release also has the usual incremental improvements: building on
-Windows, Linux and OS X is now easier, some crashes in obscure situations have
-been fixed, more useful photo EXIF metadata is shown in the <em>Images
-tab</em>, the manual has been updated to document current features and now
-displays in your default system web-browser, a bug where upside down crop
-rectangles confused the stitcher is fixed, and an annoyance where control point
-settings were not persistent between sessions is gone.</p-->
-
 <!-- Note for translators: the rest is the same as the previous release announcement -->
 
 <h2>Control point generators</h2>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5042
          http://hugin.svn.sourceforge.net/hugin/?rev=5042&view=rev
Author:   harryvanderwolf
Date:     2010-03-02 21:54:58 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Coloured Control Points in Gui Preview

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp
    hugin/trunk/src/hugin1/hugin/GreatCircles.cpp
    hugin/trunk/src/hugin1/hugin/GreatCircles.h
    hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.cpp
    hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.h
    hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp
    hugin/trunk/src/hugin_base/hugin_utils/utils.cpp
    hugin/trunk/src/hugin_base/hugin_utils/utils.h

Modified: hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp	2010-03-02 21:54:58 UTC (rev 5042)
@@ -200,17 +200,14 @@
         //inner rectangle with color proportional to max cp error (max. 10)
         wxPen MyPen(wxColour(255,0,0),1,wxSOLID);
         wxBrush MyBrush(wxColour(255,0,0),wxSOLID);
-        double red, green;
-        if(CPConnection[item]>5.0)
-        {
-            red=255.0;
-            green=(1.0-min<double>(CPConnection[item]-5.0,5.0)/5.0)*192.0;
-        }
-        else
-        {
-            green=192.0;
-            red=(CPConnection[item]/5.0)*255.0;
-        }
+        double red, green, blue;
+			
+		hugin_utils::ControlPointErrorColour(CPConnection[item],false,&red,&green,&blue);
+		
+		//Scale colour to 0-255
+		red *= 255;
+		green *= 255;
+
         MyPen.SetColour(wxColour(red,green,0));
         MyBrush.SetColour(wxColour(red,green,0));
         dc.SetPen(MyPen);

Modified: hugin/trunk/src/hugin1/hugin/GreatCircles.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GreatCircles.cpp	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin1/hugin/GreatCircles.cpp	2010-03-02 21:54:58 UTC (rev 5042)
@@ -76,6 +76,8 @@
     HuginBase::PTools::Transform transform;
     transform.createInvTransform(equirectangularImage, options);
     
+	m_xscale = viewState.GetScale();
+
     /**Handle case where the points are opposite sides of the sphere
      * (i.e. The angle startLat is -endLat and startLong is -endLong.)
      * There are infinetly many great circles in this case, we pick one going
@@ -219,14 +221,52 @@
             it->doGL();
         }
     glEnd();
+    double scale = 4 / getxscale();
+    // The scale to draw them: this is 5 pixels outside in every direction.
+	{
+		std::vector<GreatCircleArc::LineSegment>::const_iterator it;
+ 		it = m_lines.begin();
+		it->doGLcross(0,scale);
+
+		it = m_lines.end();
+		it--;	//.end points beyond last point.
+		it->doGLcross(1,scale);
+	}
 }
 
 void GreatCircleArc::LineSegment::doGL() const
 {
     glVertex2d(vertices[0].x, vertices[0].y);
     glVertex2d(vertices[1].x, vertices[1].y);
+
 }
 
+double GreatCircleArc::getxscale(void) const
+{
+	return m_xscale;
+}
+
+
+void GreatCircleArc::LineSegment::doGLcross(int point, double xscale) const
+{
+
+    glBegin(GL_LINES);
+        double vx, vy;
+
+    	vx = vertices[point].x;
+		vy = vertices[point].y;
+
+        // main diagonal
+        glVertex2f(vx - xscale, vy - xscale);
+        glVertex2f(vx + xscale, vy + xscale);
+        // second diagonal
+        glVertex2f(vx - xscale, vy + xscale);
+        glVertex2f(vx + xscale, vy - xscale);
+
+    glEnd();
+}
+
+
 float GreatCircleArc::squareDistance(hugin_utils::FDiff2D point) const
 {
     // find the minimal distance.

Modified: hugin/trunk/src/hugin1/hugin/GreatCircles.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/GreatCircles.h	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin1/hugin/GreatCircles.h	2010-03-02 21:54:58 UTC (rev 5042)
@@ -84,6 +84,8 @@
          * This is an approximation, but should be reasonable.
          */
         float squareDistance(hugin_utils::FDiff2D point) const;
+		double m_xscale ;
+		double getxscale() const;
     protected:
         struct LineSegment
         {
@@ -92,8 +94,10 @@
             float squareDistance(hugin_utils::FDiff2D point) const;
             /// Specify the line to OpenGL. Must be within a glBegin/glEnd pair.
             void doGL() const;
+			void doGLcross(int point, double cscale) const;
         };
         std::vector<LineSegment> m_lines;
+		
 };
 
 #endif

Modified: hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.cpp	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.cpp	2010-03-02 21:54:58 UTC (rev 5042)
@@ -69,13 +69,23 @@
         {
             // draw line control points blue instead of orange.
             bool line = cp.mode != HuginBase::ControlPoint::X_Y;
-            if (line) glColor3f(0.0, 0.5, 1.0);
+            if (line) 
+			{
+				glColor3f(0.0, 0.5, 1.0);
+			}
+            else
+			{
+
+				double red, green, blue;
+				hugin_utils::ControlPointErrorColour(cp.error,false,&red,&green,&blue);
+				glColor3d(red, green, blue);
+
+			}
             // draw a the smallest great circle arc between these two points.
             double x1, y1, x2, y2;
             transforms[cp.image1Nr].transformImgCoord(x1, y1, cp.x1, cp.y1);
             transforms[cp.image2Nr].transformImgCoord(x2, y2, cp.x2, cp.y2);
             m_greatCircles.drawLineFromSpherical(x1, y1, x2, y2);
-            if (line) glColor3f(1.0, 0.5, 0.0);
         }
     }
     glColor3f(1.0, 1.0, 1.0);

Modified: hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.h	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin1/hugin/PreviewControlPointTool.h	2010-03-02 21:54:58 UTC (rev 5042)
@@ -26,6 +26,7 @@
 
 #include "PreviewTool.h"
 #include "GreatCircles.h"
+#include "hugin_utils/utils.h"
 
 #include <panotools/PanoToolsInterface.h>
 

Modified: hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-03-02 21:54:58 UTC (rev 5042)
@@ -550,15 +550,10 @@
     } else if (numberOfControlPoints == 0) {
         // no control points, use a grey line
         glColor3ub(170, 170, 170);
-    }else if (worstError <= 5.0) {
-        // low error.
-        glColor3f(worstError / 5.0, 1.0, 0.0);
-    } else if (worstError < 20.0) {
-        // medium error
-        glColor3f(1.0, 1.0 - ((worstError - 5.0) / 15.0), 0.0);
-    } else {
-        // big error
-        glColor3ub(255, 0, 0);
+    }else {
+		double red, green, blue;
+		hugin_utils::ControlPointErrorColour(worstError,true,&red,&green,&blue);
+		glColor3d(red, green, blue);
     }
     
     double lineWidth = numberOfControlPoints / 5.0 + 1.0;

Modified: hugin/trunk/src/hugin_base/hugin_utils/utils.cpp
===================================================================
--- hugin/trunk/src/hugin_base/hugin_utils/utils.cpp	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin_base/hugin_utils/utils.cpp	2010-03-02 21:54:58 UTC (rev 5042)
@@ -201,4 +201,46 @@
     return number;
 }
 
+	void ControlPointErrorColour(const double cperr, 
+		const bool worst, double* r,double* g, double* b)
+	{	
+		//Colour change points
+		double xp1,xp2;
+
+		//Use two scalings
+		if (worst)
+		{
+			//For maximum control point error
+			xp1 = 5;
+			xp2 = 20;
+		}
+		else
+		{
+			//For individual control point error
+			xp1 = 3;
+			xp2 = 15;
+		}
+
+		if ( cperr<= xp1) 
+		{
+			//low error
+			*r = cperr / xp1;
+			*g = 0.75+cperr/(xp1*4);
+		}
+		else if ( cperr < xp2) 
+		{
+			// medium error
+			*r = 1.0;
+			*g = 1.0 - ((cperr - xp1)/(xp2-xp1));
+	    } 
+		else 
+		{
+        // big error
+			*r = 1.0;
+			*g = 0.0;
+		}
+		*b = 0.0;
+	}
+
+
 } //namespace

Modified: hugin/trunk/src/hugin_base/hugin_utils/utils.h
===================================================================
--- hugin/trunk/src/hugin_base/hugin_utils/utils.h	2010-03-02 21:08:57 UTC (rev 5041)
+++ hugin/trunk/src/hugin_base/hugin_utils/utils.h	2010-03-02 21:54:58 UTC (rev 5042)
@@ -279,6 +279,8 @@
         return ret;
     }
     
+	void ControlPointErrorColour(const double cperr, 
+		const bool worst, double* r,double* g, double* b);
 
 } // namespace
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5041
          http://hugin.svn.sourceforge.net/hugin/?rev=5041&view=rev
Author:   brunopostle
Date:     2010-03-02 21:08:57 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Change reported date from 23July2009 to 16February2010

Modified Paths:
--------------
    autopano-sift-C/trunk/APSCpp/APSCpp_main.c

Modified: autopano-sift-C/trunk/APSCpp/APSCpp_main.c
===================================================================
--- autopano-sift-C/trunk/APSCpp/APSCpp_main.c	2010-03-01 15:37:48 UTC (rev 5040)
+++ autopano-sift-C/trunk/APSCpp/APSCpp_main.c	2010-03-02 21:08:57 UTC (rev 5041)
@@ -45,7 +45,7 @@
  *
  */
 
-#define APSCPP_VERSION "2.5.2 23July2009"  // now separate from package version
+#define APSCPP_VERSION "2.5.2 16February2010"  // now separate from package version
 
 #include <time.h>
 #include "AutoPanoSift.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5040
          http://hugin.svn.sourceforge.net/hugin/?rev=5040&view=rev
Author:   harryvanderwolf
Date:     2010-03-01 15:37:48 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
merge trunk /5039 (Harry van der Wolf) [OSX] Fix cmake compilation Hugin on OSX (patch from Dave Tow)

Modified Paths:
--------------
    hugin/releases/2010.0/src/hugin1/hugin/GLViewer.cpp

Modified: hugin/releases/2010.0/src/hugin1/hugin/GLViewer.cpp
===================================================================
--- hugin/releases/2010.0/src/hugin1/hugin/GLViewer.cpp	2010-03-01 15:26:59 UTC (rev 5039)
+++ hugin/releases/2010.0/src/hugin1/hugin/GLViewer.cpp	2010-03-01 15:37:48 UTC (rev 5040)
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef __APPLE__
+#include "panoinc_WX.h"
+#endif
+
 #include "panoinc.h"
 #include <config.h>
 #define GLEW_STATIC


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5039
          http://hugin.svn.sourceforge.net/hugin/?rev=5039&view=rev
Author:   harryvanderwolf
Date:     2010-03-01 15:26:59 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
[OSX] Fix cmake compilation Hugin on OSX (patch from Dave Tow)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/GLViewer.cpp

Modified: hugin/trunk/src/hugin1/hugin/GLViewer.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLViewer.cpp	2010-03-01 06:18:55 UTC (rev 5038)
+++ hugin/trunk/src/hugin1/hugin/GLViewer.cpp	2010-03-01 15:26:59 UTC (rev 5039)
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef __APPLE__
+#include "panoinc_WX.h"
+#endif
+
 #include "panoinc.h"
 #include <config.h>
 #define GLEW_STATIC


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5030
          http://hugin.svn.sourceforge.net/hugin/?rev=5030&view=rev
Author:   harryvanderwolf
Date:     2010-02-27 20:35:57 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
[OSX] correct MaskLoadDialog.h and XCode project after svn commit 5014

Modified Paths:
--------------
    hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
    hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h

Modified: hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj
===================================================================
--- hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2010-02-27 11:57:19 UTC (rev 5029)
+++ hugin/trunk/mac/Hugin.xcodeproj/project.pbxproj	2010-02-27 20:35:57 UTC (rev 5030)
@@ -871,6 +871,8 @@
 		57EA97D90C3A940500E4965E /* RotatePanorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */; };
 		57EA97DA0C3A940500E4965E /* RotatePanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA97D80C3A940500E4965E /* RotatePanorama.h */; };
 		57FD5826101B3E7C0065B9E9 /* CPDetectorConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57FD5825101B3E7B0065B9E9 /* CPDetectorConfig.cpp */; };
+		730B1AEA1139B2B30014462B /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; };
+		730B1AEB1139B2B30014462B /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; };
 		7329278810E4A7AE00D3C8CB /* image_variables.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278310E4A7AE00D3C8CB /* image_variables.h */; };
 		7329278910E4A7AE00D3C8CB /* ImageVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 7329278410E4A7AE00D3C8CB /* ImageVariable.h */; };
 		7329278A10E4A7AE00D3C8CB /* ImageVariableGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7329278510E4A7AE00D3C8CB /* ImageVariableGroup.cpp */; };
@@ -3135,6 +3137,8 @@
 		57FD5825101B3E7B0065B9E9 /* CPDetectorConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPDetectorConfig.cpp; sourceTree = "<group>"; };
 		57FD5827101B3E840065B9E9 /* CPDetectorConfig_default.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDetectorConfig_default.h; sourceTree = "<group>"; };
 		57FD5828101B3E840065B9E9 /* CPDetectorConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDetectorConfig.h; sourceTree = "<group>"; };
+		730B1AE81139B2B20014462B /* MaskLoadDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MaskLoadDialog.h; path = ../src/hugin1/hugin/MaskLoadDialog.h; sourceTree = SOURCE_ROOT; };
+		730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MaskLoadDialog.cpp; path = ../src/hugin1/hugin/MaskLoadDialog.cpp; sourceTree = SOURCE_ROOT; };
 		7329278310E4A7AE00D3C8CB /* image_variables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_variables.h; sourceTree = "<group>"; };
 		7329278410E4A7AE00D3C8CB /* ImageVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageVariable.h; sourceTree = "<group>"; };
 		7329278510E4A7AE00D3C8CB /* ImageVariableGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageVariableGroup.cpp; sourceTree = "<group>"; };
@@ -5342,6 +5346,8 @@
 		57FC3ABD0675E43600C3E0AC = {
 			isa = PBXGroup;
 			children = (
+				730B1AE81139B2B20014462B /* MaskLoadDialog.h */,
+				730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */,
 				738A7749112B4869004E3612 /* Mask.cpp */,
 				738A774A112B4869004E3612 /* Mask.h */,
 				738A773A112B4507004E3612 /* MaskEditorPanel.cpp */,
@@ -7921,6 +7927,7 @@
 				732927B010E4C15700D3C8CB /* PreviewLayoutLinesTool.cpp in Sources */,
 				738A773E112B4508004E3612 /* MaskEditorPanel.cpp in Sources */,
 				738A773F112B4508004E3612 /* MaskImageCtrl.cpp in Sources */,
+				730B1AEA1139B2B30014462B /* MaskLoadDialog.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8061,6 +8068,7 @@
 				739193B31119FC73007D96F4 /* PreviewLayoutLinesTool.cpp in Sources */,
 				738A7740112B4508004E3612 /* MaskEditorPanel.cpp in Sources */,
 				738A7741112B4508004E3612 /* MaskImageCtrl.cpp in Sources */,
+				730B1AEB1139B2B30014462B /* MaskLoadDialog.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h	2010-02-27 11:57:19 UTC (rev 5029)
+++ hugin/trunk/src/hugin1/hugin/MaskLoadDialog.h	2010-02-27 20:35:57 UTC (rev 5030)
@@ -29,6 +29,7 @@
 #define _MASKLOADDIALOG_H
 
 #include "panoinc_WX.h"
+#include "panoinc.h"
 #include <PT/Panorama.h>
 #include <base_wx/ImageCache.h>
 #include <hugin/MaskImageCtrl.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5037
          http://hugin.svn.sourceforge.net/hugin/?rev=5037&view=rev
Author:   tmodes
Date:     2010-03-01 06:17:23 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Warn user about invalid characters in filenames

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/platform.cpp
    hugin/trunk/src/hugin1/base_wx/platform.h
    hugin/trunk/src/hugin1/hugin/MainFrame.cpp
    hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp
    hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp

Modified: hugin/trunk/src/hugin1/base_wx/platform.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.cpp	2010-03-01 06:15:14 UTC (rev 5036)
+++ hugin/trunk/src/hugin1/base_wx/platform.cpp	2010-03-01 06:17:23 UTC (rev 5037)
@@ -287,3 +287,27 @@
 #endif // MAC_SELF_CONTAINED_BUNDLE
 
 #endif // __WXMAC__
+
+const wxString getInvalidCharacters()
+{
+#if defined __WXMSW__
+    // the characters :"*?<>| are not allowed in filenames, these are handled well by the file dialog
+    // we need only to check for characters, which does not work with the makefiles
+    return wxT("=;%");
+#else
+    return wxT("=;:%");
+#endif
+};
+
+bool containsInvalidCharacters(const wxString stringToTest)
+{
+    if(stringToTest.IsEmpty())
+        return false;
+    wxString forbiddenChars=getInvalidCharacters();
+    for(unsigned int j=0;j<forbiddenChars.size();j++)
+    {
+        if(stringToTest.Find(forbiddenChars[j])!=wxNOT_FOUND)
+            return true;
+    };
+    return false;
+};

Modified: hugin/trunk/src/hugin1/base_wx/platform.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.h	2010-03-01 06:15:14 UTC (rev 5036)
+++ hugin/trunk/src/hugin1/base_wx/platform.h	2010-03-01 06:17:23 UTC (rev 5037)
@@ -59,4 +59,9 @@
 
 #endif //__WXMAC__
 
+/** returns all invalid characters for the filename (mainly characters, which does not work with gnu make) */
+const wxString getInvalidCharacters();
+/** returns true, if the given strings contains invalid characters */
+bool containsInvalidCharacters(const wxString stringToTest);
+
 #endif

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2010-03-01 06:15:14 UTC (rev 5036)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2010-03-01 06:17:23 UTC (rev 5037)
@@ -824,20 +824,31 @@
         // e safe the current path to config
         config->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later
 
-        std::vector<std::string> filesv;
-        for (unsigned int i=0; i< Pathnames.GetCount(); i++) {
-            filesv.push_back((const char *)Pathnames[i].mb_str(HUGIN_CONV_FILENAME));
+        bool foundForbiddenChars=false;
+        for(unsigned int i=0;i<Pathnames.GetCount(); i++)
+           foundForbiddenChars=foundForbiddenChars || containsInvalidCharacters(Pathnames[i]);
+        if(foundForbiddenChars)
+        {
+            wxMessageBox(wxString::Format(_("The filename(s) contains one of the following invalid characters: %s\nHugin can not work with these filenames. Please rename your file(s) and try again."),getInvalidCharacters().c_str()),
+                _("Error"),wxOK | wxICON_EXCLAMATION,this);
         }
+        else
+        {
+            std::vector<std::string> filesv;
+            for (unsigned int i=0; i< Pathnames.GetCount(); i++) {
+                filesv.push_back((const char *)Pathnames[i].mb_str(HUGIN_CONV_FILENAME));
+            }
 
-        // we got some images to add.
-        if (filesv.size() > 0) {
-            // use a Command to ensure proper undo and updating of GUI
-            // parts
-            wxBusyCursor();
-            GlobalCmdHist::getInstance().addCommand(
-                new wxAddImagesCmd(pano,filesv)
-                );
-        }
+            // we got some images to add.
+            if (filesv.size() > 0) {
+                // use a Command to ensure proper undo and updating of GUI
+                // parts
+                wxBusyCursor();
+                GlobalCmdHist::getInstance().addCommand(
+                    new wxAddImagesCmd(pano,filesv)
+                    );
+            };
+        };
         DEBUG_INFO ( wxString::Format(wxT("img_ext: %d"), dlg.GetFilterIndex()).mb_str(wxConvLocal) )
         // save the image extension
         switch ( dlg.GetFilterIndex() ) {

Modified: hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp	2010-03-01 06:15:14 UTC (rev 5036)
+++ hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp	2010-03-01 06:17:23 UTC (rev 5037)
@@ -413,6 +413,13 @@
                      wxSAVE, wxDefaultPosition);
 		if (dlg.ShowModal() == wxID_OK)
 		{
+            while(containsInvalidCharacters(dlg.GetPath()))
+            {
+                wxMessageBox(wxString::Format(_("The given filename contains one of the following invalid characters: %s\nHugin can not work with this filename. Please enter a valid filename."),getInvalidCharacters().c_str()),
+                    _("Error"),wxOK | wxICON_EXCLAMATION,this);
+                if(dlg.ShowModal()!=wxID_OK)
+                    return;
+            };
 			wxString outname(dlg.GetPath());
 			ChangePrefix(selIndex,outname);
 			//SetStatusText(_T("Changed prefix for "+projListBox->GetSelectedProject()));

Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp
===================================================================
--- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2010-03-01 06:15:14 UTC (rev 5036)
+++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2010-03-01 06:17:23 UTC (rev 5037)
@@ -374,6 +374,13 @@
                          wxSAVE, wxDefaultPosition);
         dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")));
         if (dlg.ShowModal() == wxID_OK) {
+            while(containsInvalidCharacters(dlg.GetPath()))
+            {
+                wxMessageBox(wxString::Format(_("The given filename contains one of the following invalid characters: %s\nHugin can not work with this filename. Please enter a valid filename."),getInvalidCharacters().c_str()),
+                    _("Error"),wxOK | wxICON_EXCLAMATION);
+                if(dlg.ShowModal()!=wxID_OK)
+                    return false;
+            };
             wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later
             outname = dlg.GetPath();
         } else { // bail


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5024
          http://hugin.svn.sourceforge.net/hugin/?rev=5024&view=rev
Author:   brunopostle
Date:     2010-02-24 17:12:21 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
Make `hugin *.jpg` work (Alexandre Duret-Lutz)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/huginApp.cpp

Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.cpp	2010-02-24 01:59:03 UTC (rev 5023)
+++ hugin/trunk/src/hugin1/hugin/huginApp.cpp	2010-02-24 17:12:21 UTC (rev 5024)
@@ -340,10 +340,14 @@
                 filename.Prepend(wxFileName::GetPathSeparator());
                 filename.Prepend(cwd);
             }
+	    // Loading the project file with set actualPath to its
+	    // parent directory.  (actualPath is used as starting
+	    // directory by many subsequent file selection dialogs.)
             frame->LoadProjectFile(filename);
         } else {
             std::vector<std::string> filesv;
             for (int i=1; i< argc; i++) {
+		bool actualPathSet = false;
                 wxFileName file(argv[i]);
                 if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 ||
                     file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ||
@@ -357,7 +361,21 @@
                     file.GetExt().CmpNoCase(wxT("hdr")) == 0 ||
                     file.GetExt().CmpNoCase(wxT("viff")) == 0 )
                 {
-                    filesv.push_back((const char *)(file.GetFullPath().mb_str(HUGIN_CONV_FILENAME)));
+		    wxString filename(argv[i]);
+		    // Make sure the filename is absolute.
+		    if (! wxIsAbsolutePath(filename)) {
+			filename.Prepend(wxFileName::GetPathSeparator());
+			filename.Prepend(cwd);
+		    }
+
+                    filesv.push_back((const char *)(filename.mb_str(HUGIN_CONV_FILENAME)));
+
+		    // Use the first filename to set actualPath.
+		    if (! actualPathSet) {
+			file = filename;
+			config->Write(wxT("/actualPath"), file.GetPath());
+			actualPathSet = true;
+		    }
                 }
             }
             GlobalCmdHist::getInstance().addCommand(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5035
          http://hugin.svn.sourceforge.net/hugin/?rev=5035&view=rev
Author:   brunopostle
Date:     2010-02-28 21:46:20 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
merge trunk -r 5028 [2889525] Reject control ponits with coordinates less than zero (Gerry Patterson)

Modified Paths:
--------------
    hugin/releases/2010.0/src/hugin1/hugin/wxPanoCommand.cpp

Modified: hugin/releases/2010.0/src/hugin1/hugin/wxPanoCommand.cpp
===================================================================
--- hugin/releases/2010.0/src/hugin1/hugin/wxPanoCommand.cpp	2010-02-28 21:44:14 UTC (rev 5034)
+++ hugin/releases/2010.0/src/hugin1/hugin/wxPanoCommand.cpp	2010-02-28 21:46:20 UTC (rev 5035)
@@ -439,8 +439,10 @@
         PT::ControlPoint point = *it;
         SrcPanoImage img1 = pano.getSrcImage(point.image1Nr);
         SrcPanoImage img2 = pano.getSrcImage(point.image2Nr);
-        if (point.x1 > img1.getSize().x || point.y1 > img1.getSize().y ||
-           point.x2 > img2.getSize().x || point.y2 > img2.getSize().y) 
+        if (0 > point.x1 || point.x1 > img1.getSize().x || 
+            0 > point.y1 || point.y1 > img1.getSize().y ||
+            0 > point.x2 || point.x2 > img2.getSize().x || 
+            0 > point.y2 || point.y2 > img2.getSize().y) 
         {
             bad_cp_count++;
         } else 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5034
          http://hugin.svn.sourceforge.net/hugin/?rev=5034&view=rev
Author:   brunopostle
Date:     2010-02-28 21:44:14 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
merge trunk -r 5027 Set blender and fusion options to default value when user entered an empty string (Thomas Modes)

Modified Paths:
--------------
    hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp

Modified: hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp
===================================================================
--- hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp	2010-02-28 20:59:55 UTC (rev 5033)
+++ hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp	2010-02-28 21:44:14 UTC (rev 5034)
@@ -814,6 +814,10 @@
             if (enblend_opts_text->GetValue().length() > 0) {
                 opt.enblendOptions = enblend_opts_text->GetValue().mb_str(wxConvLocal);
             }
+            else
+            {
+                opt.enblendOptions = wxConfigBase::Get()->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal);
+            };
             GlobalCmdHist::getInstance().addCommand(
                 new PT::SetPanoOptionsCmd( *pano, opt )
                 );
@@ -842,6 +846,10 @@
         if (enfuse_opts_text->GetValue().length() > 0) {
             opt.enfuseOptions = enfuse_opts_text->GetValue().mb_str(wxConvLocal);
         }
+        else
+        {
+            opt.enfuseOptions = wxConfigBase::Get()->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal);
+        };
         GlobalCmdHist::getInstance().addCommand(
             new PT::SetPanoOptionsCmd( *pano, opt )
             );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5033
          http://hugin.svn.sourceforge.net/hugin/?rev=5033&view=rev
Author:   brunopostle
Date:     2010-02-28 20:59:55 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Chinese Traditional update (Rick Langford)

Modified Paths:
--------------
    hugin/releases/2010.0/src/translations/zh_TW.po

Modified: hugin/releases/2010.0/src/translations/zh_TW.po
===================================================================
--- hugin/releases/2010.0/src/translations/zh_TW.po	2010-02-28 20:59:48 UTC (rev 5032)
+++ hugin/releases/2010.0/src/translations/zh_TW.po	2010-02-28 20:59:55 UTC (rev 5033)
@@ -216,7 +216,7 @@
 msgid ""
 "Please use the Control Points tab to connect all images with control "
 "points.\n"
-msgstr "你可以在[控制點]索引標籤新增控制點以連結圖片.\n"
+msgstr "你可以在[控制點]索引標籤新增控制點以連接圖片.\n"
 
 #: hugin1/hugin/AssistantPanel.cpp:320
 msgid "Images or control points have changed, new alignment is needed."
@@ -340,6 +340,8 @@
 "Maybe you have not installed it properly or given a wrong path in the "
 "settings."
 msgstr ""
+"在路徑中無法找到 [%s].\n"
+"也許您尚未將其妥善安置於指定的路徑或是安裝於錯誤的路徑中."
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:217
 #, fuzzy, c-format
@@ -400,9 +402,9 @@
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:289
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:395
-#, fuzzy, c-format
+#, c-format
 msgid "Could not execute command: %s"
-msgstr "無法執行指令: "
+msgstr "無法執行指令: %s"
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:293
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:399
@@ -616,7 +618,7 @@
 msgid ""
 "Cannot run celeste without at least one control point connecting the two "
 "images"
-msgstr "由於缺少至少一個關聯兩張圖片的控制點無法執行 Celeste"
+msgstr "由於缺少至少一個連接兩張圖片的控制點無法執行 Celeste"
 
 #: hugin1/hugin/CPEditorPanel.cpp:2186 hugin1/hugin/ImagesPanel.cpp:922
 msgid "Celeste model expected in "
@@ -777,13 +779,13 @@
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:147
 msgid "Invalid input\n"
-msgstr ""
+msgstr "無效的輸入\n"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:167
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:184
 #, c-format
 msgid "Input \"%s\" for %s is not a valid number\n"
-msgstr ""
+msgstr "輸入[%s] 是無效的數字 ,對 %s 而言.\n"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:168
 #, fuzzy
@@ -792,11 +794,11 @@
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:185
 msgid "Sigma"
-msgstr ""
+msgstr "Sigma"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:201
 msgid "Wrong input"
-msgstr ""
+msgstr "錯誤的輸入"
 
 #: hugin1/hugin/HFOVDialog.cpp:76
 #, c-format
@@ -1199,6 +1201,8 @@
 "File \"%s\" not found.\n"
 "Maybe file was renamed, moved or deleted."
 msgstr ""
+"找不到檔案[%s].\n"
+"檔案可能已被改名, 移動,刪除."
 
 #: hugin1/hugin/MainFrame.cpp:1650 hugin1/ptbatcher/Batch.cpp:334
 #: hugin1/ptbatcher/Batch.cpp:687 hugin1/ptbatcher/Batch.cpp:704
@@ -1668,7 +1672,7 @@
 
 #: hugin1/hugin/PanoPanel.cpp:872
 msgid " Options for this HDRMerge program not yet implemented"
-msgstr ""
+msgstr "尚未執行 HDRMerge 軟體選項"
 
 #: hugin1/hugin/PanoPanel.cpp:962
 msgid "Could not create temporary project file"
@@ -2532,7 +2536,7 @@
 #: xrc.cpp:50 xrc.cpp:1003 xrc.cpp:1227
 #, fuzzy
 msgid "Autocrop"
-msgstr "自動"
+msgstr "自動裁剪"
 
 #: translations/xrc.cpp:51 translations/xrc.cpp:690 xrc.cpp:51 xrc.cpp:690
 msgid "auto estimate"
@@ -2578,11 +2582,11 @@
 
 #: translations/xrc.cpp:61 translations/xrc.cpp:1067 xrc.cpp:61 xrc.cpp:1067
 msgid "Average"
-msgstr ""
+msgstr "平均"
 
 #: translations/xrc.cpp:62 translations/xrc.cpp:1068 xrc.cpp:62 xrc.cpp:1068
 msgid "Average slow"
-msgstr ""
+msgstr "平均慢"
 
 #: translations/xrc.cpp:63 translations/xrc.cpp:779 translations/xrc.cpp:944
 #: xrc.cpp:63 xrc.cpp:779 xrc.cpp:944
@@ -2648,7 +2652,7 @@
 msgid ""
 "Calculate crop borders such that the final images has the largest area "
 "without excess"
-msgstr ""
+msgstr "計算剪裁邊界以確保最後的圖片有不超出邊界的最大區域"
 
 #: translations/xrc.cpp:78 translations/xrc.cpp:992 xrc.cpp:78 xrc.cpp:992
 msgid "Calculate Field of View"
@@ -2871,7 +2875,7 @@
 
 #: translations/xrc.cpp:131 translations/xrc.cpp:1069 xrc.cpp:131 xrc.cpp:1069
 msgid "Deghosting (Khan)"
-msgstr ""
+msgstr "Deghosting (Khan)"
 
 #: translations/xrc.cpp:132 translations/xrc.cpp:599 translations/xrc.cpp:1138
 #: translations/xrc.cpp:1140 xrc.cpp:132 xrc.cpp:599 xrc.cpp:1138 xrc.cpp:1140
@@ -2935,17 +2939,19 @@
 
 #: translations/xrc.cpp:146 translations/xrc.cpp:1079 xrc.cpp:146 xrc.cpp:1079
 msgid "Do not scale images (-a m)"
-msgstr ""
+msgstr "不要縮放圖片 (-a m)"
 
 #: translations/xrc.cpp:147 translations/xrc.cpp:1103 xrc.cpp:147 xrc.cpp:1103
 msgid "Downscale final pano"
 msgstr "縮減最終全景圖片"
 
 #: translations/xrc.cpp:148 translations/xrc.cpp:1239 xrc.cpp:148 xrc.cpp:1239
+#, fuzzy
 msgid "Drag"
 msgstr "拖"
 
 #: translations/xrc.cpp:149 translations/xrc.cpp:1238 xrc.cpp:149 xrc.cpp:1238
+#, fuzzy
 msgid "Drag images into position"
 msgstr "拖曳圖片定位"
 
@@ -3150,6 +3156,7 @@
 msgstr "焦距比:"
 
 #: translations/xrc.cpp:198 translations/xrc.cpp:671 xrc.cpp:198 xrc.cpp:671
+#, fuzzy
 msgid ""
 "following patterns will be substituted before running:\n"
 "%o  -- output project (0.oto will be appended when using Autopano)\n"
@@ -3195,7 +3202,7 @@
 
 #: translations/xrc.cpp:205 translations/xrc.cpp:860 xrc.cpp:205 xrc.cpp:860
 msgid "Full Screen"
-msgstr ""
+msgstr "全螢幕"
 
 #: translations/xrc.cpp:206 translations/xrc.cpp:1014 xrc.cpp:206 xrc.cpp:1014
 msgid "Fused and blended panorama"
@@ -3538,7 +3545,7 @@
 
 #: translations/xrc.cpp:284 translations/xrc.cpp:837 xrc.cpp:284 xrc.cpp:837
 msgid "Most recently used projects"
-msgstr ""
+msgstr "最近使用的專案"
 
 #: translations/xrc.cpp:285 translations/xrc.cpp:713 translations/xrc.cpp:1148
 #: xrc.cpp:285 xrc.cpp:713 xrc.cpp:1148
@@ -3680,7 +3687,7 @@
 
 #: translations/xrc.cpp:315 translations/xrc.cpp:1071 xrc.cpp:315 xrc.cpp:1071
 msgid "Only consider pixels that are defined in all images (-c)"
-msgstr ""
+msgstr "只考慮被定義在所有圖片中的像素 (-c)"
 
 #: translations/xrc.cpp:316 translations/xrc.cpp:929 xrc.cpp:316 xrc.cpp:929
 msgid "Only use control points between image selected in preview window."
@@ -3787,7 +3794,7 @@
 
 #: translations/xrc.cpp:336 translations/xrc.cpp:1074 xrc.cpp:336 xrc.cpp:1074
 msgid "Options for deghosting"
-msgstr ""
+msgstr "deghost選項"
 
 #: translations/xrc.cpp:337 translations/xrc.cpp:1005 xrc.cpp:337 xrc.cpp:1005
 msgid "Output"
@@ -4035,7 +4042,7 @@
 
 #: translations/xrc.cpp:398 translations/xrc.cpp:717 xrc.cpp:398 xrc.cpp:717
 msgid "Remove control points connecting the selected images"
-msgstr "移除關聯到選取圖片上的控制點"
+msgstr "移除連接到選取圖片上的控制點"
 
 #: translations/xrc.cpp:399 translations/xrc.cpp:1099 xrc.cpp:399 xrc.cpp:1099
 msgid "Remove outlying control points by statistical method"
@@ -4269,7 +4276,7 @@
 
 #: translations/xrc.cpp:453 translations/xrc.cpp:1226 xrc.cpp:453 xrc.cpp:1226
 msgid "Set the crop region to the largest rectangle covered by images"
-msgstr ""
+msgstr "對圖片覆蓋的最大矩形設定裁剪區域"
 
 #: translations/xrc.cpp:454 translations/xrc.cpp:732 xrc.cpp:454 xrc.cpp:732
 msgid "Settings:"
@@ -4329,7 +4336,7 @@
 
 #: translations/xrc.cpp:466 translations/xrc.cpp:861 xrc.cpp:466 xrc.cpp:861
 msgid "Shows hugins main window on full screen"
-msgstr ""
+msgstr "全螢幕顯示hugins主視窗"
 
 #: translations/xrc.cpp:467 translations/xrc.cpp:907 xrc.cpp:467 xrc.cpp:907
 msgid "Show the OpenGL preview image"
@@ -4362,7 +4369,7 @@
 
 #: translations/xrc.cpp:474 translations/xrc.cpp:1076 xrc.cpp:474 xrc.cpp:1076
 msgid "Sigma:"
-msgstr ""
+msgstr "Sigma:"
 
 #: translations/xrc.cpp:475 translations/xrc.cpp:978 translations/xrc.cpp:1159
 #: xrc.cpp:475 xrc.cpp:978 xrc.cpp:1159
@@ -4411,7 +4418,7 @@
 
 #: translations/xrc.cpp:485 translations/xrc.cpp:564 xrc.cpp:485 xrc.cpp:564
 msgid "Sponsors"
-msgstr ""
+msgstr "贊助者"
 
 #: translations/xrc.cpp:486 translations/xrc.cpp:645 xrc.cpp:486 xrc.cpp:645
 msgid "start"
@@ -4504,7 +4511,7 @@
 
 #: translations/xrc.cpp:504 translations/xrc.cpp:1073 xrc.cpp:504 xrc.cpp:1073
 msgid "This merge mode has no further options."
-msgstr ""
+msgstr "合併模式無其他選項"
 
 #: translations/xrc.cpp:505 translations/xrc.cpp:871 xrc.cpp:505 xrc.cpp:871
 msgid "&Tip of the day"
@@ -4585,7 +4592,7 @@
 
 #: translations/xrc.cpp:522 translations/xrc.cpp:565 xrc.cpp:522 xrc.cpp:565
 msgid "Upstream"
-msgstr ""
+msgstr "回溯"
 
 #: translations/xrc.cpp:523 translations/xrc.cpp:1165 xrc.cpp:523 xrc.cpp:1165
 msgid "Use alternative Enblend program"
@@ -4624,7 +4631,7 @@
 
 #: translations/xrc.cpp:530 translations/xrc.cpp:1078 xrc.cpp:530 xrc.cpp:1078
 msgid "Use gamma 2.2 instead of logarithmic (-a g)"
-msgstr ""
+msgstr "以伽瑪(gamma) 2.2取代 對數(logarithmic)  (-a g)"
 
 #: translations/xrc.cpp:531 translations/xrc.cpp:1162 xrc.cpp:531 xrc.cpp:1162
 msgid "Use GPU for remapping (EXPERIMENTAL)"
@@ -4632,7 +4639,7 @@
 
 #: translations/xrc.cpp:532 translations/xrc.cpp:1077 xrc.cpp:532 xrc.cpp:1077
 msgid "Use gray images for processing (-a f)"
-msgstr ""
+msgstr "以灰階圖處理 (-a f)"
 
 #: translations/xrc.cpp:533 translations/xrc.cpp:1088 xrc.cpp:533 xrc.cpp:1088
 msgid "User Interface"
@@ -4656,9 +4663,8 @@
 msgstr "詳盡的輸出"
 
 #: translations/xrc.cpp:538 translations/xrc.cpp:561 xrc.cpp:538 xrc.cpp:561
-#, fuzzy
 msgid "version"
-msgstr "版本 %s"
+msgstr "版本"
 
 #: translations/xrc.cpp:539 translations/xrc.cpp:991 xrc.cpp:539 xrc.cpp:991
 msgid "vertical:"
@@ -4781,7 +4787,7 @@
 "case, control points have to be created manually, using the control points "
 "tab."
 msgstr ""
-"有時 Autopano 無法發現全部圖片之間的關係. 這樣的狀況下, 不得不使用[控制點]索"
+"有時 Autopano 無法發現全部圖片之間的連接. 這樣的狀況下, 不得不使用[控制點]索"
 "引標籤以手動創建控制點."
 
 #: hugin1/hugin/xrc/data/tips.txt:8
@@ -4955,427 +4961,653 @@
 "只有當圖片重疊程度很高並且有很多分布良好的控制點時, 對所有失真參數執行最佳化"
 "選項 [所有參數] 才會有效果."
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
+msgid ""
+"\n"
+"\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"\n"
 
-#~ msgid ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
+msgid ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
+"\n"
+"\n"
 
-#~ msgid ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
+msgid ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
+msgstr ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
 
-#~ msgid "a"
-#~ msgstr "a"
+msgid "a"
+msgstr "a"
 
-#~ msgid "b"
-#~ msgstr "b"
+msgid "b"
+msgstr "b"
 
-#~ msgid "c"
-#~ msgstr "c"
+msgid "c"
+msgstr "c"
 
-#~ msgid "d"
-#~ msgstr "d"
+msgid "d"
+msgstr "d"
 
-#~ msgid "e"
-#~ msgstr "e"
+msgid "e"
+msgstr "e"
 
-#~ msgid "g"
-#~ msgstr "g"
+msgid "g"
+msgstr "g"
 
-#~ msgid "t"
-#~ msgstr "t"
+msgid "t"
+msgstr "t"
 
-#~ msgid "mm"
-#~ msgstr "mm"
+msgid "mm"
+msgstr "mm"
 
-#~ msgid ""
-#~ "a0123456789012345678901234567890123456789\n"
-#~ "b\n"
-#~ "c\n"
-#~ "d\n"
-#~ "e"
-#~ msgstr ""
-#~ "a0123456789012345678901234567890123456789\n"
-#~ "b\n"
-#~ "c\n"
-#~ "d\n"
-#~ "e"
+msgid ""
+"a0123456789012345678901234567890123456789\n"
+"b\n"
+"c\n"
+"d\n"
+"e"
+msgstr ""
+"a0123456789012345678901234567890123456789\n"
+"b\n"
+"c\n"
+"d\n"
+"e"
 
-#~ msgid "Autopano-SIFT"
-#~ msgstr "Autopano-SIFT"
+msgid "Autopano-SIFT"
+msgstr "Autopano-SIFT"
 
-#~ msgid "x:"
-#~ msgstr "x:"
+msgid "x:"
+msgstr "x:"
 
-#~ msgid "y:"
-#~ msgstr "y:"
+msgid "y:"
+msgstr "y:"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+msgid "100%"
+msgstr "100%"
 
-#~ msgid "200%"
-#~ msgstr "200%"
+msgid "200%"
+msgstr "200%"
 
-#~ msgid "150%"
-#~ msgstr "150%"
+msgid "150%"
+msgstr "150%"
 
-#~ msgid "75%"
-#~ msgstr "75%"
+msgid "75%"
+msgstr "75%"
 
-#~ msgid "50%"
-#~ msgstr "50%"
+msgid "50%"
+msgstr "50%"
 
-#~ msgid "25%"
-#~ msgstr "25%"
+msgid "25%"
+msgstr "25%"
 
-#~ msgid "tries to remove control points from clouds."
-#~ msgstr "嘗試從雲朵上移除控制點."
+msgid "tries to remove control points from clouds."
+msgstr "嘗試從雲朵上移除控制點."
 
-#~ msgid "Make:"
-#~ msgstr "製造商:"
+msgid "Make:"
+msgstr "製造商:"
 
-#~ msgid "Model:"
-#~ msgstr "型號:"
+msgid "Model:"
+msgstr "型號:"
 
-#~ msgid "* r^2"
-#~ msgstr "* r^2"
+msgid "* r^2"
+msgstr "* r^2"
 
-#~ msgid "* r^4"
-#~ msgstr "* r^4"
+msgid "* r^4"
+msgstr "* r^4"
 
-#~ msgid "* r^6"
-#~ msgstr "* r^6"
+msgid "* r^6"
+msgstr "* r^6"
 
-#~ msgid "Nona"
-#~ msgstr "Nona"
+msgid "Nona"
+msgstr "Nona"
 
-#~ msgid "TIFF"
-#~ msgstr "TIFF"
+msgid "TIFF"
+msgstr "TIFF"
 
-#~ msgid "JPEG"
-#~ msgstr "JPEG"
+msgid "JPEG"
+msgstr "JPEG"
 
-#~ msgid "PNG"
-#~ msgstr "PNG"
+msgid "PNG"
+msgstr "PNG"
 
-#~ msgid "LZW"
-#~ msgstr "LZW"
+msgid "LZW"
+msgstr "LZW"
 
-#~ msgid "Deflate"
-#~ msgstr "Deflate"
+msgid "Deflate"
+msgstr "Deflate"
 
-#~ msgid "EXR"
-#~ msgstr "EXR"
+msgid "EXR"
+msgstr "EXR"
 
-#~ msgid "MB"
-#~ msgstr "MB"
+msgid "MB"
+msgstr "MB"
 
-#~ msgid "PTStitcher:"
-#~ msgstr "PTStitcher:"
+msgid "PTStitcher:"
+msgstr "PTStitcher:"
 
-#~ msgid "..."
-#~ msgstr "..."
+msgid "..."
+msgstr "..."
 
-#~ msgid "c = "
-#~ msgstr "c = "
+msgid "c = "
+msgstr "c = "
 
-#~ msgid " + "
-#~ msgstr " + "
+msgid " + "
+msgstr " + "
 
-#~ msgid "*r^2 + "
-#~ msgstr "*r^2 + "
+msgid "*r^2 + "
+msgstr "*r^2 + "
 
-#~ msgid "*r^4 + "
-#~ msgstr "*r^4 + "
+msgid "*r^4 + "
+msgstr "*r^4 + "
 
-#~ msgid "*r^6"
-#~ msgstr "*r^6"
+msgid "*r^6"
+msgstr "*r^6"
 
-#~ msgid ""
-#~ "Autopano-SIFT not found. Please specify a valid path in the preferences"
-#~ msgstr "沒有發現 Autopano-SIFT. 請在預設項中指定一個有效目錄"
+msgid "Autopano-SIFT not found. Please specify a valid path in the preferences"
+msgstr "沒有發現 Autopano-SIFT. 請在預設項中指定一個有效目錄"
 
-#~ msgid "\"%s\" not found. Please specify a valid path in the preferences"
-#~ msgstr "[%s]未被發現. 請在預設項中指定一個有效路徑"
+msgid "\"%s\" not found. Please specify a valid path in the preferences"
+msgstr "[%s]未被發現. 請在預設項中指定一個有效路徑"
 
-#~ msgid "Error in Autopano command"
-#~ msgstr "Autopano 指令錯誤"
+msgid "Error in Autopano command"
+msgstr "Autopano 指令錯誤"
 
-#~ msgid "command: "
-#~ msgstr "指令: "
+msgid "command: "
+msgstr "指令: "
 
-#~ msgid "Could not open "
-#~ msgstr "無法開啟 "
+msgid "Could not open "
+msgstr "無法開啟 "
 
-#~ msgid "autopano failure"
-#~ msgstr "Autopano 失敗"
+msgid "autopano failure"
+msgstr "Autopano 失敗"
 
-#~ msgid "%s not found. Please specify a valid path in the preferences"
-#~ msgstr "%s 未被發現 請在預設項中指定一個有效路徑"
+msgid "%s not found. Please specify a valid path in the preferences"
+msgstr "%s 未被發現 請在預設項中指定一個有效路徑"
 
-#~ msgid ""
-#~ "\n"
-#~ " current directory:"
-#~ msgstr ""
-#~ "\n"
-#~ "目前目錄位置:"
+msgid ""
+"\n"
+" current directory:"
+msgstr ""
+"\n"
+"目前目錄位置:"
 
-#~ msgid "Autopano result"
-#~ msgstr "Autopano 結果"
+msgid "Autopano result"
+msgstr "Autopano 結果"
 
-#~ msgid "Prerelease %s"
-#~ msgstr "試用版 %s"
+msgid "Prerelease %s"
+msgstr "試用版 %s"
 
-#~ msgid ""
-#~ "Out of memory.\n"
-#~ "Try again with a smaller panorama image size\n"
-#~ msgstr ""
-#~ "記憶體不足.\n"
-#~ "請使用較小的全景圖片尺寸再試一次\n"
+msgid ""
+"Out of memory.\n"
+"Try again with a smaller panorama image size\n"
+msgstr ""
+"記憶體不足.\n"
+"請使用較小的全景圖片尺寸再試一次\n"
 
-#~ msgid "Select enblend.exe"
-#~ msgstr "選取 enblend.exe"
+msgid "Select enblend.exe"
+msgstr "選取 enblend.exe"
 
-#~ msgid "No enblend.exe selected"
-#~ msgstr "沒有選取 enblend.exe"
+msgid "No enblend.exe selected"
+msgstr "沒有選取 enblend.exe"
 
-#~ msgid "Select enblend commandline tool"
-#~ msgstr "選取 Enblend 指令串工具"
+msgid "Select enblend commandline tool"
+msgstr "選取 Enblend 指令串工具"
 
-#~ msgid "No enblend commandline tool selected"
-#~ msgstr "沒有選取 Enblend 指令串工具"
+msgid "No enblend commandline tool selected"
+msgstr "沒有選取 Enblend 指令串工具"
 
-#~ msgid ""
-#~ "Can not call enblend with a command line > 32766 characters.\n"
-#~ "This is a Windows limitation\n"
-#~ "Please use less images, or place the images in a folder with\n"
-#~ "a shorter pathname"
-#~ msgstr ""
-#~ "無法使用一個長度 > 32766 字符的指令串來調用 enblend.\n"
-#~ "這是Windows 系統的限制\n"
-#~ "請使用較少圖片, 或者將圖片放在\n"
-#~ "一個具有較短目錄名的檔案夾中"
+msgid ""
+"Can not call enblend with a command line > 32766 characters.\n"
+"This is a Windows limitation\n"
+"Please use less images, or place the images in a folder with\n"
+"a shorter pathname"
+msgstr ""
+"無法使用一個長度 > 32766 字符的指令串來調用 enblend.\n"
+"這是Windows 系統的限制\n"
+"請使用較少圖片, 或者將圖片放在\n"
+"一個具有較短目錄名的檔案夾中"
 
-#~ msgid "enblend error"
-#~ msgstr "Enblend 錯誤"
+msgid "enblend error"
+msgstr "Enblend 錯誤"
 
-#~ msgid "gamma must be a number"
-#~ msgstr "伽瑪必須是一個數字"
+msgid "gamma must be a number"
+msgstr "伽瑪必須是一個數字"
 
-#~ msgid "Not yet implemented"
-#~ msgstr "尚未執行"
+msgid "Not yet implemented"
+msgstr "尚未執行"
 
-#~ msgid "Delete autopano setting"
-#~ msgstr "刪除 Autopano 設定"
+msgid "Delete autopano setting"
+msgstr "刪除 Autopano 設定"
 
-#~ msgid "Bicubic"
-#~ msgstr "雙三次"
+msgid "Bicubic"
+msgstr "雙三次"
 
-#~ msgid "Nearest neighbour"
-#~ msgstr "鄰近像素"
+msgid "Nearest neighbour"
+msgstr "鄰近像素"
 
+msgid ""
+"PTStitcher does not support output filenames that include a dot character "
+"(.).\n"
+"Please save your projects in a directory without dot in the pathname.\n"
+"\n"
+"Do you want to continue anyway?"
+msgstr ""
+"PTStitcher 不支持輸出包含點 (.) 字符的檔案名.\n"
+"請將您的專案儲存到一個不包含點字符的目錄名稱中.\n"
+"\n"
+"確定繼續嗎?"
+
+msgid "PTStitcher problem"
+msgstr "PTStitcher 問題"
+
+msgid "PTStitcher.exe does not support QTVR output on Windows and Linux"
+msgstr "PTStitcher.exe 在 Windows 和 Linux 系統下不支持 QTVR 輸出"
+
+msgid "PTStitcher note"
+msgstr "PTStitcher 注釋"
+
+msgid "Select PTStitcher.exe"
+msgstr "選取 PTStitcher.exe"
+
+msgid "No PTStitcher.exe selected"
+msgstr "未選取 PTStitcher.exe"
+
+msgid "Select PTStitcher commandline tool"
+msgstr "選取 PTStitcher 指令串工具"
+
+msgid "No PTStitcher commandline tool selected"
+msgstr "沒有選取 PTStitcher 指令串工具"
+
+msgid ""
+"Warning: PTmender (from panotools 2.9 or later) only supports TIFF_m "
+"output.\n"
+"For color and brightness correction, the resulting tiff files must be "
+"processed with PTblender.\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"注意: PTmender (panotools 2.9 或者升級版) 只支持 TIFF_m 輸出.\n"
+"為了顏色和亮度校正, tiff 結果檔案必須使用 PTblender 進行處理.\n"
+"\n"
+"確定繼續?"
+
+msgid "PTmender creates only plain TIFF_m files"
+msgstr "PTmender 只創建無格式 TIFF_m 檔案"
+
+msgid "Failed to launch the PTStitcher."
+msgstr "載入 PTStitcher 失敗."
+
+msgid "Could not obtain PTStitcher output"
+msgstr "無法獲得 PTStitcher 輸出"
+
+msgid ""
+"Stitching failed\n"
+"PTStitcher exited with nonzero error code."
+msgstr ""
+"接合失敗\n"
+"PTStitcher 帶有非零錯誤碼退出."
+
+msgid "Error executing %s"
+msgstr "執行 %s 發生錯誤"
+
+msgid "Use alternative Autopano-SIFT program"
+msgstr "使用可選 Autopano-SIFT 應用程式"
+
+msgid "Text mode"
+msgstr "文本模式"
+
+msgid "Hugin Reference"
+msgstr "Hugin 參考"
+
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤快捷鍵"
+
+msgid "Optimizing"
+msgstr "最佳化中"
+
+msgid "PTStitcher"
+msgstr "PTStitcher"
+
+msgid "Abort"
+msgstr "中斷"
+
+msgid "Choose which autopano program should be used\n"
+msgstr "選取 Autopano 應用程式\n"
+
+msgid "Autopano"
+msgstr "Autopano"
+
+msgid ""
+"These are the default arguments. They can be changed for individal projects "
+"in the Stitcher tab.\n"
+"Do not set -w, -o and --compression arguments, they are set by hugin"
+msgstr ""
+"這裡是默認指令碼. 可以為了單獨專案在[接合器]索引標籤中改變它們.\n"
+"不要設定 -w, -o 和 --compression 指令碼, 它們由 hugin 指定"
+
+msgid "Parameters for autopano program"
+msgstr "Autopano 應用程式的參數"
+
+msgid "Autopano program"
+msgstr "Autopano 應用程式"
+
+msgid "Seam blending"
+msgstr "融合接縫"
+
+msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+msgstr "Autopano (1.03 版或者更新版本), 來自於 http://autopano.kolor.com"
+
+msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+msgstr ""
+"Autopano-SIFT, 來自於 http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+
+msgid ""
+"Finished running Celeste.\n"
+"%d cloud-like control points removed."
+msgstr ""
+"已成功執行 Celeste.\n"
+"%d 雲似的基準點已經被移除."
+
+msgid "Not a jpeg file:"
+msgstr "這不是一個 jpeg 檔:"
+
+msgid "Select Autopano-SIFT"
+msgstr "選取 Autopano-SIFT"
+
+msgid " is not in list."
+msgstr " 不在列表中."
+
+msgid "File"
+msgstr "檔案"
+
+msgid "Help"
+msgstr "幫助"
+
+msgid "Error: Could not remove temporary file"
+msgstr "錯誤: 無法移除暫存檔"
+
+msgid "For panoramas consisting of images with similar exposure"
+msgstr "為圖片組成的全景圖片套用類似光圈"
+
+msgid "Output remapped images with exposure correction"
+msgstr "輸出使用光圈校正的重定位圖片"
+
+msgid "Exposure Blending"
+msgstr "演算融合光圈"
+
+msgid "For panoramas consisting of images with varying exposure"
+msgstr "為圖片組成的全景圖片使用不同光圈"
+
+msgid "Blended panorama (enfuse)"
+msgstr "融合後的全景圖片 (enfuse)"
+
+msgid "Fully automatic exposure blending"
+msgstr "完全自動演算融合光圈"
+
+msgid "Blended HDR panorama"
+msgstr "融合後的 HDR 全景圖片"
+
+msgid "Output a blended high dynamic range panorama"
+msgstr "輸出一張融合後的高動態範圍的全景圖片"
+
+msgid "Stacked HDR images"
+msgstr "堆棧後的 HDR 圖片"
+
+msgid "Output the individual, remapped HDR stacks"
+msgstr "輸出單獨的, 重定位的 HDR 棧"
+
+msgid "Individual non merged images"
+msgstr "單獨的沒有合併的圖片"
+
+msgid "Autopano-SIFT (by S. Nowozin)"
+msgstr "Autopano-SIFT (作者  S. Nowozin)"
+
+msgid "Autopano-SIFT:"
+msgstr "Autopano-SIFT:"
+
+msgid "Autopano:"
+msgstr "Autopano:"
+
 #~ msgid ""
-#~ "PTStitcher does not support output filenames that include a dot character "
-#~ "(.).\n"
-#~ "Please save your projects in a directory without dot in the pathname.\n"
+#~ "Note: automatic alignment uses default settings from the preferences. If "
+#~ "you customize settings for this project in the advanced tabs and want to "
+#~ "use these customized settings, run the CP detection from the Images Tab, "
+#~ "the geometrical optimization from the the Optimizer tab and the "
+#~ "photometric optimization from the Exposure tab."
+#~ msgstr ""
+#~ "注意;自動化使用預設的設定值.如果你想在進階標籤中為這個專案自行設定數值並且"
+#~ "使用您的設定.在[圖片]標籤中執行CP偵測,在[最佳化]標籤中執行幾何最佳化,在[曝"
+#~ "光]標籤中執行光學性質最佳化."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please use %i to specify the input files and %k to specify the keypoint "
+#~ "file for generate keys step"
+#~ msgstr "請使用 %namefile, %i 或者 %s 來為 Autopano-SIFT 指定輸入檔案"
+
+#~ msgid ""
+#~ "Please use %k to specify the keypoint files and %o to specify the output "
+#~ "project file for the matching step"
+#~ msgstr ""
+#~ "在配對步驟中,請使用 %k 來指定 keypoint 檔案並使用 %o 指定輸出專案檔 "
+
+#~ msgid "generating key file"
+#~ msgstr "產生 key 檔案"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments (images). Try using a cp generator setting which "
+#~ "supports the %%s parameter in preferences.\n"
 #~ "\n"
-#~ "Do you want to continue anyway?"
+#~ " Could not execute command: %s"
 #~ msgstr ""
-#~ "PTStitcher 不支持輸出包含點 (.) 字符的檔案名.\n"
-#~ "請將您的專案儲存到一個不包含點字符的目錄名稱中.\n"
+#~ "存在過多程式碼(圖片) 請嘗試預設項目中 %s參數.\n"
 #~ "\n"
-#~ "確定繼續嗎?"
+#~ "不能執行指令:"
 
-#~ msgid "PTStitcher problem"
-#~ msgstr "PTStitcher 問題"
+#~ msgid "Try to connect all overlapping images."
+#~ msgstr "試著連接所有重疊的圖片"
 
-#~ msgid "PTStitcher.exe does not support QTVR output on Windows and Linux"
-#~ msgstr "PTStitcher.exe 在 Windows 和 Linux 系統下不支持 QTVR 輸出"
+#, fuzzy
+#~ msgid "Only work on image pairs without control points."
+#~ msgstr "沒有控制點無法測量圖片位置"
 
-#~ msgid "PTStitcher note"
-#~ msgstr "PTStitcher 注釋"
+#, fuzzy
+#~ msgid "Select control point detector program"
+#~ msgstr "控制點偵測器"
 
-#~ msgid "Select PTStitcher.exe"
-#~ msgstr "選取 PTStitcher.exe"
+#~ msgid "Resets the projections parameters to their default values."
+#~ msgstr "將專案參數值重設為預設值"
 
-#~ msgid "No PTStitcher.exe selected"
-#~ msgstr "未選取 PTStitcher.exe"
+#~ msgid "X (TrX)"
+#~ msgstr "X (TrX)"
 
-#~ msgid "Select PTStitcher commandline tool"
-#~ msgstr "選取 PTStitcher 指令串工具"
+#~ msgid "Y (TrY)"
+#~ msgstr "Y (TrY)"
 
-#~ msgid "No PTStitcher commandline tool selected"
-#~ msgstr "沒有選取 PTStitcher 指令串工具"
+#~ msgid "Z (TrZ)"
+#~ msgstr "Z (TrZ)"
 
+#~ msgid "Stack Number"
+#~ msgstr "堆棧圖號碼"
+
 #~ msgid ""
-#~ "Warning: PTmender (from panotools 2.9 or later) only supports TIFF_m "
-#~ "output.\n"
-#~ "For color and brightness correction, the resulting tiff files must be "
-#~ "processed with PTblender.\n"
-#~ "\n"
-#~ "Continue anyway?"
-#~ msgstr ""
-#~ "注意: PTmender (panotools 2.9 或者升級版) 只支持 TIFF_m 輸出.\n"
-#~ "為了顏色和亮度校正, tiff 結果檔案必須使用 PTblender 進行處理.\n"
-#~ "\n"
-#~ "確定繼續?"
+#~ "Your project must have at least two stacks before you can assign images "
+#~ "to a different stack."
+#~ msgstr "專案中至少要有2份堆棧圖, 才可以將圖片指定至不一樣的堆棧圖中."
 
-#~ msgid "PTmender creates only plain TIFF_m files"
-#~ msgstr "PTmender 只創建無格式 TIFF_m 檔案"
+#, fuzzy
+#~ msgid "Enter new stack number"
+#~ msgstr "輸入新的鏡頭編號"
 
-#~ msgid "Failed to launch the PTStitcher."
-#~ msgstr "載入 PTStitcher 失敗."
+#, fuzzy
+#~ msgid "stack number"
+#~ msgstr "鏡頭編號"
 
-#~ msgid "Could not obtain PTStitcher output"
-#~ msgstr "無法獲得 PTStitcher 輸出"
+#, fuzzy
+#~ msgid "Change stack number"
+#~ msgstr "修改鏡頭編號"
 
 #~ msgid ""
-#~ "Stitching failed\n"
-#~ "PTStitcher exited with nonzero error code."
-#~ msgstr ""
-#~ "接合失敗\n"
-#~ "PTStitcher 帶有非零錯誤碼退出."
+#~ "Your project must have at least two lenses before you can change which "
+#~ "lens these images use."
+#~ msgstr "在你想要改變鏡頭的專案中，最少必須使用兩個鏡頭"
 
-#~ msgid "Error executing %s"
-#~ msgstr "執行 %s 發生錯誤"
+#, fuzzy
+#~ msgid "Panini General"
+#~ msgstr "一般"
 
-#~ msgid "Use alternative Autopano-SIFT program"
-#~ msgstr "使用可選 Autopano-SIFT 應用程式"
+#~ msgid "Finnish"
+#~ msgstr "芬蘭文"
 
-#~ msgid "Text mode"
-#~ msgstr "文本模式"
+#~ msgid "Click a connection to edit control points."
+#~ msgstr "點擊一個連接以編輯控制點."
 
-#~ msgid "Hugin Reference"
-#~ msgstr "Hugin 參考"
+#, fuzzy
+#~ msgid "All images at once"
+#~ msgstr "增加圖片: 取消"
 
-#~ msgid "Keyboard Shortcuts"
-#~ msgstr "鍵盤快捷鍵"
+#~ msgid "Panorama with stacks"
+#~ msgstr "有堆棧圖的全景圖"
 
-#~ msgid "Optimizing"
-#~ msgstr "最佳化中"
+#, fuzzy
+#~ msgid "Multi-row panorama"
+#~ msgstr "預覽全景圖片"
 
-#~ msgid "PTStitcher"
-#~ msgstr "PTStitcher"
+#~ msgid "Multi-row panorama with stacks"
+#~ msgstr "有堆棧圖的多列全景圖"
 
-#~ msgid "Abort"
-#~ msgstr "中斷"
+#, fuzzy
+#~ msgid "Prealigned panorama"
+#~ msgstr "預覽全景圖片"
 
-#~ msgid "Choose which autopano program should be used\n"
-#~ msgstr "選取 Autopano 應用程式\n"
+#~ msgid "One step detector"
+#~ msgstr "一段式探測器"
 
-#~ msgid "Autopano"
-#~ msgstr "Autopano"
+#~ msgid "Two step detector"
+#~ msgstr "兩段式探測器"
 
-#~ msgid ""
-#~ "These are the default arguments. They can be changed for individal "
-#~ "projects in the Stitcher tab.\n"
-#~ "Do not set -w, -o and --compression arguments, they are set by hugin"
-#~ msgstr ""
-#~ "這裡是默認指令碼. 可以為了單獨專案在[接合器]索引標籤中改變它們.\n"
-#~ "不要設定 -w, -o 和 --compression 指令碼, 它們由 hugin 指定"
+#~ msgid "Feature descriptor:"
+#~ msgstr "特徵描述："
 
-#~ msgid "Parameters for autopano program"
-#~ msgstr "Autopano 應用程式的參數"
+#, fuzzy
+#~ msgid "Feature matcher:"
+#~ msgstr "拍攝日期:"
 
-#~ msgid "Autopano program"
-#~ msgstr "Autopano 應用程式"
+#~ msgid "Detector for stacks"
+#~ msgstr "堆棧式圖片探測器"
 
-#~ msgid "Seam blending"
-#~ msgstr "融合接縫"
+#~ msgid "Leave empty, when no control point detector should run on stacks."
+#~ msgstr "當堆棧圖片沒有需要使用的控制點偵測器時,保持空白."
 
-#~ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
-#~ msgstr "Autopano (1.03 版或者更新版本), 來自於 http://autopano.kolor.com"
+#, fuzzy
+#~ msgid "Advanced option"
+#~ msgstr "融合軟體選項"
 
-#~ msgid ""
-#~ "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
-#~ msgstr ""
-#~ "Autopano-SIFT, 來自於 http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+#~ msgid "This setting has no advanced options."
+#~ msgstr "這個設定沒有進階選項"
 
-#~ msgid ""
-#~ "Finished running Celeste.\n"
-#~ "%d cloud-like control points removed."
-#~ msgstr ""
-#~ "已成功執行 Celeste.\n"
-#~ "%d 雲似的基準點已經被移除."
+#~ msgid "New stack"
+#~ msgstr "新的堆棧圖"
 
-#~ msgid "Not a jpeg file:"
-#~ msgstr "這不是一個 jpeg 檔:"
+#~ msgid "Link the positions of the selected images only with themselves"
+#~ msgstr "只在被選取的圖片中連結位置"
 
-#~ msgid "Select Autopano-SIFT"
-#~ msgstr "選取 Autopano-SIFT"
+#, fuzzy
+#~ msgid "Change stack..."
+#~ msgstr "修改鏡頭..."
 
-#~ msgid " is not in list."
-#~ msgstr " 不在列表中."
+#~ msgid "Switch the selected images to a different stack."
+#~ msgstr "將選取的圖片更換至不同的堆棧圖中"
 
-#~ msgid "File"
-#~ msgstr "檔案"
+#~ msgid "Link positions across this stack."
+#~ msgstr "超出(跨過)這個堆棧圖連接位置"
 
-#~ msgid "Help"
-#~ msgstr "幫助"
+#~ msgid "X:"
+#~ msgstr "X:"
 
-#~ msgid "Error: Could not remove temporary file"
-#~ msgstr "錯誤: 無法移除暫存檔"
+#, fuzzy
+#~ msgid "set yaw for selected image(s)"
+#~ msgstr "為選取的圖片設定橫向角度"
 
-#~ msgid "For panoramas consisting of images with similar exposure"
-#~ msgstr "為圖片組成的全景圖片套用類似光圈"
+#~ msgid "Y:"
+#~ msgstr "Y:"
 
-#~ msgid "Output remapped images with exposure correction"
-#~ msgstr "輸出使用光圈校正的重定位圖片"
+#, fuzzy
+#~ msgid "set pitch for selected image(s)"
+#~ msgstr "為選取的圖片設定縱向角度"
 
-#~ msgid "Exposure Blending"
-#~ msgstr "演算融合光圈"
+#~ msgid "Z:"
+#~ msgstr "Z:"
 
-#~ msgid "For panoramas consisting of images with varying exposure"
-#~ msgstr "為圖片組成的全景圖片使用不同光圈"
+#, fuzzy
+#~ msgid "set roll for selected image(s)"
+#~ msgstr "為選取的圖片設定旋轉角度"
 
-#~ msgid "Blended panorama (enfuse)"
-#~ msgstr "融合後的全景圖片 (enfuse)"
+#, fuzzy
+#~ msgid "&Import Project..."
+#~ msgstr "增加專案..."
 
-#~ msgid "Fully automatic exposure blending"
-#~ msgstr "完全自動演算融合光圈"
+#~ msgid "Import an existing projection file into current project."
+#~ msgstr "輸入一個已存在的投影檔案至現在的專案中"
 
-#~ msgid "Blended HDR panorama"
-#~ msgstr "融合後的 HDR 全景圖片"
+#, fuzzy
+#~ msgid "Positions and Translation (y,p,r,x,y,z)"
+#~ msgstr "位置和桶狀失真 (y,p,r,b)"
 
-#~ msgid "Output a blended high dynamic range panorama"
-#~ msgstr "輸出一張融合後的高動態範圍的全景圖片"
+#, fuzzy
+#~ msgid "Positions, Translation and View (y,p,r,x,y,z,v)"
+#~ msgstr "位置和視角 (y,p,r,v)"
 
-#~ msgid "Stacked HDR images"
-#~ msgstr "堆棧後的 HDR 圖片"
+#, fuzzy
+#~ msgid "Positions, Translation and Barrel (y,p,r,x,y,z,b)"
+#~ msgstr "位置, 視角和桶狀失真 (y,p,r,v,b)"
 
-#~ msgid "Output the individual, remapped HDR stacks"
-#~ msgstr "輸出單獨的, 重定位的 HDR 棧"
+#, fuzzy
+#~ msgid "Positions, Translation, View and Barrel (y,p,r,x,y,z,v,b)"
+#~ msgstr "位置, 視角和桶狀失真 (y,p,r,v,b)"
 
-#~ msgid "Individual non merged images"
-#~ msgstr "單獨的沒有合併的圖片"
+#~ msgid ""
+#~ "Sets the exposure value of the panorama to the mean exposure of all "
+#~ "images."
+#~ msgstr "將參述中的曝光值為設定全部圖片的曝光數平均值"
 
-#~ msgid "Autopano-SIFT (by S. Nowozin)"
-#~ msgstr "Autopano-SIFT (作者  S. Nowozin)"
+#, fuzzy
+#~ msgid "Scale:"
+#~ msgstr "儲存"
 
-#~ msgid "Autopano-SIFT:"
-#~ msgstr "Autopano-SIFT:"
+#~ msgid ""
+#~ "* A grey line indicates there are no control points, but the image pair "
+#~ "overlaps.\n"
+#~ "* A green line indicates good alignment.\n"
+#~ "* A red line indicates poor alignment. "
+#~ msgstr ""
+#~ "* 灰線表示找不到控制點,但是圖片成對的重疊.\n"
+#~ "* 綠線表示好的對準.\n"
+#~ "* 紅線表示不好的對準. "
 
-#~ msgid "Autopano:"
-#~ msgstr "Autopano:"
+#~ msgid "Layout"
+#~ msgstr "版面"
+
+#~ msgid "×"
+#~ msgstr "×"
+
+#, fuzzy
+#~ msgid "Automatically straighten a wavy horizon."
+#~ msgstr "自動拉直波狀水平線."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5032
          http://hugin.svn.sourceforge.net/hugin/?rev=5032&view=rev
Author:   brunopostle
Date:     2010-02-28 20:59:48 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Chinese Traditional update (Rick Langford)

Modified Paths:
--------------
    hugin/trunk/src/translations/zh_TW.po

Modified: hugin/trunk/src/translations/zh_TW.po
===================================================================
--- hugin/trunk/src/translations/zh_TW.po	2010-02-28 11:20:27 UTC (rev 5031)
+++ hugin/trunk/src/translations/zh_TW.po	2010-02-28 20:59:48 UTC (rev 5032)
@@ -216,7 +216,7 @@
 msgid ""
 "Please use the Control Points tab to connect all images with control "
 "points.\n"
-msgstr "你可以在[控制點]索引標籤新增控制點以連結圖片.\n"
+msgstr "你可以在[控制點]索引標籤新增控制點以連接圖片.\n"
 
 #: hugin1/hugin/AssistantPanel.cpp:324
 msgid "Images or control points have changed, new alignment is needed."
@@ -258,6 +258,9 @@
 "geometrical optimization from the the Optimizer tab and the photometric "
 "optimization from the Exposure tab."
 msgstr ""
+"注意;自動化使用預設的設定值.如果你想在進階標籤中為這個專案自行設定數值並且使"
+"用您的設定.在[圖片]標籤中執行CP偵測,在[最佳化]標籤中執行幾何最佳化,在[曝光]標"
+"籤中執行光學性質最佳化."
 
 #: hugin1/hugin/AssistantPanel.cpp:385
 msgid ""
@@ -349,6 +352,8 @@
 "Maybe you have not installed it properly or given a wrong path in the "
 "settings."
 msgstr ""
+"在路徑中無法找到 [%s].\n"
+"也許您尚未將其妥善安置於指定的路徑或是安裝於錯誤的路徑中."
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:314
 #, fuzzy, c-format
@@ -421,9 +426,9 @@
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:500
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:573
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:673
-#, fuzzy, c-format
+#, c-format
 msgid "Could not execute command: %s"
-msgstr "無法執行指令: "
+msgstr "無法執行指令: %s"
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:392
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:507
@@ -472,11 +477,11 @@
 msgid ""
 "Please use %k to specify the keypoint files and %o to specify the output "
 "project file for the matching step"
-msgstr ""
+msgstr "在配對步驟中,請使用 %k 來指定 keypoint 檔案並使用 %o 指定輸出專案檔 "
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:493
 msgid "generating key file"
-msgstr ""
+msgstr "產生 key 檔案"
 
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:561
 #, fuzzy, c-format
@@ -520,7 +525,7 @@
 
 #: hugin1/hugin/CPDetectorConfig.cpp:385
 msgid "Try to connect all overlapping images."
-msgstr ""
+msgstr "試著連接所有重疊的圖片"
 
 #: hugin1/hugin/CPDetectorConfig.cpp:391
 #, fuzzy
@@ -680,7 +685,7 @@
 msgid ""
 "Cannot run celeste without at least one control point connecting the two "
 "images"
-msgstr "由於缺少至少一個關聯兩張圖片的控制點無法執行 Celeste"
+msgstr "由於缺少至少一個連接兩張圖片的控制點無法執行 Celeste"
 
 #: hugin1/hugin/CPEditorPanel.cpp:2186 hugin1/hugin/ImagesPanel.cpp:1013
 msgid "Celeste model expected in "
@@ -776,7 +781,7 @@
 #: hugin1/hugin/PanoPanel.cpp:921 translations/xrc.cpp:495 xrc.cpp:495
 #, fuzzy
 msgid "Autocrop"
-msgstr "自動"
+msgstr "自動裁剪"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:234 hugin1/hugin/PreviewFrame.cpp:128
 msgid "displayed images"
@@ -810,7 +815,7 @@
 
 #: hugin1/hugin/GLPreviewFrame.cpp:393 hugin1/hugin/PreviewFrame.cpp:297
 msgid "Resets the projections parameters to their default values."
-msgstr ""
+msgstr "將專案參數值重設為預設值"
 
 #: hugin1/hugin/GLPreviewFrame.cpp:402 hugin1/hugin/PreviewFrame.cpp:306
 msgid "param:"
@@ -903,13 +908,13 @@
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:147
 msgid "Invalid input\n"
-msgstr ""
+msgstr "無效的輸入\n"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:167
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:184
 #, c-format
 msgid "Input \"%s\" for %s is not a valid number\n"
-msgstr ""
+msgstr "輸入[%s] 是無效的數字 ,對 %s 而言.\n"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:168
 #, fuzzy
@@ -918,11 +923,11 @@
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:185
 msgid "Sigma"
-msgstr ""
+msgstr "Sigma"
 
 #: hugin1/hugin/HDRMergeOptionDialog.cpp:201
 msgid "Wrong input"
-msgstr ""
+msgstr "錯誤的輸入"
 
 #: hugin1/hugin/HFOVDialog.cpp:76
 #, c-format
@@ -993,15 +998,15 @@
 
 #: hugin1/hugin/ImagesList.cpp:359
 msgid "X (TrX)"
-msgstr ""
+msgstr "X (TrX)"
 
 #: hugin1/hugin/ImagesList.cpp:360
 msgid "Y (TrY)"
-msgstr ""
+msgstr "Y (TrY)"
 
 #: hugin1/hugin/ImagesList.cpp:361
 msgid "Z (TrZ)"
-msgstr ""
+msgstr "Z (TrZ)"
 
 #: hugin1/hugin/ImagesList.cpp:362
 msgid "Anchor"
@@ -1013,7 +1018,7 @@
 
 #: hugin1/hugin/ImagesList.cpp:364
 msgid "Stack Number"
-msgstr ""
+msgstr "堆棧圖號碼"
 
 #: hugin1/hugin/ImagesList.cpp:482
 msgid "Lens no."
@@ -1104,7 +1109,7 @@
 msgid ""
 "Your project must have at least two stacks before you can assign images to a "
 "different stack."
-msgstr ""
+msgstr "專案中至少要有2份堆棧圖, 才可以將圖片指定至不一樣的堆棧圖中."
 
 #: hugin1/hugin/ImagesPanel.cpp:942
 #, fuzzy
@@ -1163,7 +1168,7 @@
 msgid ""
 "Your project must have at least two lenses before you can change which lens "
 "these images use."
-msgstr ""
+msgstr "在你想要改變鏡頭的專案中，最少必須使用兩個鏡頭"
 
 #: hugin1/hugin/LensPanel.cpp:1057
 msgid "Enter new lens number"
@@ -1366,6 +1371,8 @@
 "File \"%s\" not found.\n"
 "Maybe file was renamed, moved or deleted."
 msgstr ""
+"找不到檔案[%s].\n"
+"檔案可能已被改名, 移動,刪除."
 
 #: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:334
 #: hugin1/ptbatcher/Batch.cpp:687 hugin1/ptbatcher/Batch.cpp:704
@@ -1794,7 +1801,7 @@
 
 #: hugin1/hugin/PanoPanel.cpp:873
 msgid " Options for this HDRMerge program not yet implemented"
-msgstr ""
+msgstr "尚未執行 HDRMerge 軟體選項"
 
 #: hugin1/hugin/PanoPanel.cpp:962
 msgid "Could not create temporary project file"
@@ -1898,7 +1905,7 @@
 
 #: hugin1/hugin/PreferencesDialog.cpp:177
 msgid "Finnish"
-msgstr ""
+msgstr "芬蘭文"
 
 #: hugin1/hugin/PreferencesDialog.cpp:273
 msgid "Select PTmender"
@@ -2052,9 +2059,8 @@
 msgstr "點擊創建或者編輯這裡的控制點."
 
 #: hugin1/hugin/PreviewLayoutLinesTool.cpp:174
-#, fuzzy
 msgid "Click a connection to edit control points."
-msgstr "點擊創建或者編輯這裡的控制點."
+msgstr "點擊一個連接以編輯控制點."
 
 #: hugin1/hugin/PreviewPanel.cpp:495
 msgid "Error during Stitching"
@@ -2463,9 +2469,8 @@
 msgstr "關於 Hugin"
 
 #: translations/xrc.cpp:2 xrc.cpp:2
-#, fuzzy
 msgid "version"
-msgstr "版本 %s"
+msgstr "版本"
 
 #: translations/xrc.cpp:3 translations/xrc.cpp:406 xrc.cpp:3 xrc.cpp:406
 msgid "About"
@@ -2478,11 +2483,11 @@
 
 #: translations/xrc.cpp:5 xrc.cpp:5
 msgid "Sponsors"
-msgstr ""
+msgstr "贊助者"
 
 #: translations/xrc.cpp:6 xrc.cpp:6
 msgid "Upstream"
-msgstr ""
+msgstr "回溯"
 
 #: translations/xrc.cpp:7 xrc.cpp:7
 #, fuzzy
@@ -2826,7 +2831,7 @@
 
 #: translations/xrc.cpp:114 xrc.cpp:114
 msgid "Panorama with stacks"
-msgstr ""
+msgstr "有堆棧圖的全景圖"
 
 #: translations/xrc.cpp:115 xrc.cpp:115
 #, fuzzy
@@ -2835,7 +2840,7 @@
 
 #: translations/xrc.cpp:116 xrc.cpp:116
 msgid "Multi-row panorama with stacks"
-msgstr ""
+msgstr "有堆棧圖的多列全景圖"
 
 #: translations/xrc.cpp:117 xrc.cpp:117
 #, fuzzy
@@ -2848,7 +2853,7 @@
 
 #: translations/xrc.cpp:119 xrc.cpp:119
 msgid "One step detector"
-msgstr ""
+msgstr "一段式探測器"
 
 #: translations/xrc.cpp:120 translations/xrc.cpp:132 xrc.cpp:120 xrc.cpp:132
 msgid "Program:"
@@ -2869,11 +2874,11 @@
 
 #: translations/xrc.cpp:123 xrc.cpp:123
 msgid "Two step detector"
-msgstr ""
+msgstr "兩段式探測器"
 
 #: translations/xrc.cpp:124 xrc.cpp:124
 msgid "Feature descriptor:"
-msgstr ""
+msgstr "特徵描述："
 
 #: translations/xrc.cpp:127 xrc.cpp:127
 #, fuzzy
@@ -2882,11 +2887,11 @@
 
 #: translations/xrc.cpp:130 xrc.cpp:130
 msgid "Detector for stacks"
-msgstr ""
+msgstr "堆棧式圖片探測器"
 
 #: translations/xrc.cpp:131 xrc.cpp:131
 msgid "Leave empty, when no control point detector should run on stacks."
-msgstr ""
+msgstr "當堆棧圖片沒有需要使用的控制點偵測器時,保持空白."
 
 #: translations/xrc.cpp:135 xrc.cpp:135
 #, fuzzy
@@ -2895,7 +2900,7 @@
 
 #: translations/xrc.cpp:136 xrc.cpp:136
 msgid "This setting has no advanced options."
-msgstr ""
+msgstr "這個設定沒有進階選項"
 
 #: translations/xrc.cpp:137 xrc.cpp:137
 #, fuzzy
@@ -3127,11 +3132,11 @@
 
 #: translations/xrc.cpp:192 xrc.cpp:192
 msgid "New stack"
-msgstr ""
+msgstr "新的堆棧圖"
 
 #: translations/xrc.cpp:193 xrc.cpp:193
 msgid "Link the positions of the selected images only with themselves"
-msgstr ""
+msgstr "只在被選取的圖片中連結位置"
 
 #: translations/xrc.cpp:194 xrc.cpp:194
 #, fuzzy
@@ -3140,7 +3145,7 @@
 
 #: translations/xrc.cpp:195 xrc.cpp:195
 msgid "Switch the selected images to a different stack."
-msgstr ""
+msgstr "將選取的圖片更換至不同的堆棧圖中"
 
 #: translations/xrc.cpp:196 xrc.cpp:196
 msgid "Remove points"
@@ -3148,7 +3153,7 @@
 
 #: translations/xrc.cpp:197 xrc.cpp:197
 msgid "Remove control points connecting the selected images"
-msgstr "移除關聯到選取圖片上的控制點"
+msgstr "移除連接到選取圖片上的控制點"
 
 #: translations/xrc.cpp:198 xrc.cpp:198
 msgid "Run Celeste"
@@ -3205,11 +3210,11 @@
 
 #: translations/xrc.cpp:210 xrc.cpp:210
 msgid "Link positions across this stack."
-msgstr ""
+msgstr "超出(跨過)這個堆棧圖連接位置"
 
 #: translations/xrc.cpp:211 translations/xrc.cpp:430 xrc.cpp:211 xrc.cpp:430
 msgid "X:"
-msgstr ""
+msgstr "X:"
 
 #: translations/xrc.cpp:212 xrc.cpp:212
 #, fuzzy
@@ -3217,9 +3222,8 @@
 msgstr "為選取的圖片設定橫向角度"
 
 #: translations/xrc.cpp:213 translations/xrc.cpp:431 xrc.cpp:213 xrc.cpp:431
-#, fuzzy
 msgid "Y:"
-msgstr "橫向角度:"
+msgstr "Y:"
 
 #: translations/xrc.cpp:214 xrc.cpp:214
 #, fuzzy
@@ -3228,7 +3232,7 @@
 
 #: translations/xrc.cpp:215 translations/xrc.cpp:432 xrc.cpp:215 xrc.cpp:432
 msgid "Z:"
-msgstr ""
+msgstr "Z:"
 
 #: translations/xrc.cpp:216 xrc.cpp:216
 #, fuzzy
@@ -3561,7 +3565,7 @@
 
 #: translations/xrc.cpp:326 xrc.cpp:326
 msgid "Most recently used projects"
-msgstr ""
+msgstr "最近使用的專案"
 
 #: translations/xrc.cpp:327 xrc.cpp:327
 #, fuzzy
@@ -3591,7 +3595,7 @@
 
 #: translations/xrc.cpp:333 xrc.cpp:333
 msgid "Import an existing projection file into current project."
-msgstr ""
+msgstr "輸入一個已存在的投影檔案至現在的專案中"
 
 #: translations/xrc.cpp:334 xrc.cpp:334
 msgid "Apply &Template"
@@ -3660,11 +3664,11 @@
 
 #: translations/xrc.cpp:351 xrc.cpp:351
 msgid "Full Screen"
-msgstr ""
+msgstr "全螢幕"
 
 #: translations/xrc.cpp:352 xrc.cpp:352
 msgid "Shows hugins main window on full screen"
-msgstr ""
+msgstr "全螢幕顯示hugins主視窗"
 
 #: translations/xrc.cpp:353 xrc.cpp:353
 msgid "&Control point table"
@@ -4150,7 +4154,7 @@
 msgid ""
 "Calculate crop borders such that the final images has the largest area "
 "without excess"
-msgstr ""
+msgstr "計算剪裁邊界以確保最後的圖片有不超出邊界的最大區域"
 
 #: translations/xrc.cpp:497 xrc.cpp:497
 msgid "Output"
@@ -4370,15 +4374,15 @@
 
 #: translations/xrc.cpp:570 xrc.cpp:570
 msgid "Average"
-msgstr ""
+msgstr "平均"
 
 #: translations/xrc.cpp:571 xrc.cpp:571
 msgid "Average slow"
-msgstr ""
+msgstr "平均慢"
 
 #: translations/xrc.cpp:572 xrc.cpp:572
 msgid "Deghosting (Khan)"
-msgstr ""
+msgstr "Deghosting (Khan)"
 
 #: translations/xrc.cpp:573 translations/xrc.cpp:575 translations/xrc.cpp:583
 #: xrc.cpp:573 xrc.cpp:575 xrc.cpp:583
@@ -4388,15 +4392,15 @@
 
 #: translations/xrc.cpp:574 xrc.cpp:574
 msgid "Only consider pixels that are defined in all images (-c)"
-msgstr ""
+msgstr "只考慮被定義在所有圖片中的像素 (-c)"
 
 #: translations/xrc.cpp:576 xrc.cpp:576
 msgid "This merge mode has no further options."
-msgstr ""
+msgstr "合併模式無其他選項"
 
 #: translations/xrc.cpp:577 xrc.cpp:577
 msgid "Options for deghosting"
-msgstr ""
+msgstr "deghost選項"
 
 #: translations/xrc.cpp:578 xrc.cpp:578
 #, fuzzy
@@ -4405,19 +4409,19 @@
 
 #: translations/xrc.cpp:579 xrc.cpp:579
 msgid "Sigma:"
-msgstr ""
+msgstr "Sigma:"
 
 #: translations/xrc.cpp:580 xrc.cpp:580
 msgid "Use gray images for processing (-a f)"
-msgstr ""
+msgstr "以灰階圖處理 (-a f)"
 
 #: translations/xrc.cpp:581 xrc.cpp:581
 msgid "Use gamma 2.2 instead of logarithmic (-a g)"
-msgstr ""
+msgstr "以伽瑪(gamma) 2.2取代 對數(logarithmic)  (-a g)"
 
 #: translations/xrc.cpp:582 xrc.cpp:582
 msgid "Do not scale images (-a m)"
-msgstr ""
+msgstr "不要縮放圖片 (-a m)"
 
 #: translations/xrc.cpp:584 xrc.cpp:584
 msgid "Preferences - hugin"
@@ -4923,7 +4927,7 @@
 #: translations/xrc.cpp:743 xrc.cpp:743
 msgid ""
 "Sets the exposure value of the panorama to the mean exposure of all images."
-msgstr ""
+msgstr "將參述中的曝光值為設定全部圖片的曝光數平均值"
 
 #: translations/xrc.cpp:746 xrc.cpp:746
 #, fuzzy
@@ -4937,14 +4941,17 @@
 "* A green line indicates good alignment.\n"
 "* A red line indicates poor alignment. "
 msgstr ""
+"* 灰線表示找不到控制點,但是圖片成對的重疊.\n"
+"* 綠線表示好的對準.\n"
+"* 紅線表示不好的對準. "
 
 #: translations/xrc.cpp:748 xrc.cpp:748
 msgid "Layout"
-msgstr ""
+msgstr "版面"
 
 #: translations/xrc.cpp:752 xrc.cpp:752
 msgid "×"
-msgstr ""
+msgstr "×"
 
 #: translations/xrc.cpp:755 xrc.cpp:755
 #, fuzzy
@@ -4963,7 +4970,7 @@
 
 #: translations/xrc.cpp:762 xrc.cpp:762
 msgid "Set the crop region to the largest rectangle covered by images"
-msgstr ""
+msgstr "對圖片覆蓋的最大矩形設定裁剪區域"
 
 #: translations/xrc.cpp:767 xrc.cpp:767
 #, fuzzy
@@ -5088,7 +5095,7 @@
 "case, control points have to be created manually, using the control points "
 "tab."
 msgstr ""
-"有時 Autopano 無法發現全部圖片之間的關係. 這樣的狀況下, 不得不使用[控制點]索"
+"有時 Autopano 無法發現全部圖片之間的連接. 這樣的狀況下, 不得不使用[控制點]索"
 "引標籤以手動創建控制點."
 
 #: hugin1/hugin/xrc/data/tips.txt:8
@@ -5262,351 +5269,349 @@
 "只有當圖片重疊程度很高並且有很多分布良好的控制點時, 對所有失真參數執行最佳化"
 "選項 [所有參數] 才會有效果."
 
-#~ msgid "Select Autopano program"
-#~ msgstr "選取 Autopano 應用程式"
+msgid "Select Autopano program"
+msgstr "選取 Autopano 應用程式"
 
-#~ msgid "About program"
-#~ msgstr "關於應用程式"
+msgid "About program"
+msgstr "關於應用程式"
 
-#~ msgid "About this application"
-#~ msgstr "關於這個應用程式"
+msgid "About this application"
+msgstr "關於這個應用程式"
 
-#~ msgid "Finetune"
-#~ msgstr "調整"
+msgid "Finetune"
+msgstr "調整"
 
-#~ msgid "Ok"
-#~ msgstr "確定"
+msgid "Ok"
+msgstr "確定"
 
-#~ msgid "select"
-#~ msgstr "選取"
+msgid "select"
+msgstr "選取"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
+msgid ""
+"\n"
+"\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"\n"
 
-#~ msgid ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
+msgid ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
+"\n"
+"\n"
 
-#~ msgid ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "0123456789012345678901234567890123456789012345\n"
-#~ "\n"
-#~ "\n"
+msgid ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
+msgstr ""
+"0123456789012345678901234567890123456789012345\n"
+"\n"
+"\n"
 
-#~ msgid "a"
-#~ msgstr "a"
+msgid "a"
+msgstr "a"
 
-#~ msgid "b"
-#~ msgstr "b"
+msgid "b"
+msgstr "b"
 
-#~ msgid "c"
-#~ msgstr "c"
+msgid "c"
+msgstr "c"
 
-#~ msgid "d"
-#~ msgstr "d"
+msgid "d"
+msgstr "d"
 
-#~ msgid "e"
-#~ msgstr "e"
+msgid "e"
+msgstr "e"
 
-#~ msgid "g"
-#~ msgstr "g"
+msgid "g"
+msgstr "g"
 
-#~ msgid "t"
-#~ msgstr "t"
+msgid "t"
+msgstr "t"
 
-#~ msgid "Autopano-SIFT"
-#~ msgstr "Autopano-SIFT"
+msgid "Autopano-SIFT"
+msgstr "Autopano-SIFT"
 
-#~ msgid "tries to remove control points from clouds."
-#~ msgstr "嘗試從雲朵上移除控制點."
+msgid "tries to remove control points from clouds."
+msgstr "嘗試從雲朵上移除控制點."
 
-#~ msgid "Make:"
-#~ msgstr "製造商:"
+msgid "Make:"
+msgstr "製造商:"
 
-#~ msgid "Model:"
-#~ msgstr "型號:"
+msgid "Model:"
+msgstr "型號:"
 
-#~ msgid ""
-#~ "Autopano-SIFT not found. Please specify a valid path in the preferences"
-#~ msgstr "沒有發現 Autopano-SIFT. 請在預設項中指定一個有效目錄"
+msgid "Autopano-SIFT not found. Please specify a valid path in the preferences"
+msgstr "沒有發現 Autopano-SIFT. 請在預設項中指定一個有效目錄"
 
-#~ msgid "\"%s\" not found. Please specify a valid path in the preferences"
-#~ msgstr "[%s]未被發現. 請在預設項中指定一個有效路徑"
+msgid "\"%s\" not found. Please specify a valid path in the preferences"
+msgstr "[%s]未被發現. 請在預設項中指定一個有效路徑"
 
-#~ msgid "Error in Autopano command"
-#~ msgstr "Autopano 指令錯誤"
+msgid "Error in Autopano command"
+msgstr "Autopano 指令錯誤"
 
-#~ msgid "command: "
-#~ msgstr "指令: "
+msgid "command: "
+msgstr "指令: "
 
-#~ msgid "Could not open "
-#~ msgstr "無法開啟 "
+msgid "Could not open "
+msgstr "無法開啟 "
 
-#~ msgid "autopano failure"
-#~ msgstr "Autopano 失敗"
+msgid "autopano failure"
+msgstr "Autopano 失敗"
 
-#~ msgid "%s not found. Please specify a valid path in the preferences"
-#~ msgstr "%s 未被發現 請在預設項中指定一個有效路徑"
+msgid "%s not found. Please specify a valid path in the preferences"
+msgstr "%s 未被發現 請在預設項中指定一個有效路徑"
 
-#~ msgid ""
-#~ "\n"
-#~ " current directory:"
-#~ msgstr ""
-#~ "\n"
-#~ "目前目錄位置:"
+msgid ""
+"\n"
+" current directory:"
+msgstr ""
+"\n"
+"目前目錄位置:"
 
-#~ msgid "Autopano result"
-#~ msgstr "Autopano 結果"
+msgid "Autopano result"
+msgstr "Autopano 結果"
 
-#~ msgid "Prerelease %s"
-#~ msgstr "試用版 %s"
+msgid "Prerelease %s"
+msgstr "試用版 %s"
 
-#~ msgid ""
-#~ "Out of memory.\n"
-#~ "Try again with a smaller panorama image size\n"
-#~ msgstr ""
-#~ "記憶體不足.\n"
-#~ "請使用較小的全景圖片尺寸再試一次\n"
+msgid ""
+"Out of memory.\n"
+"Try again with a smaller panorama image size\n"
+msgstr ""
+"記憶體不足.\n"
+"請使用較小的全景圖片尺寸再試一次\n"
 
-#~ msgid "Select enblend.exe"
-#~ msgstr "選取 enblend.exe"
+msgid "Select enblend.exe"
+msgstr "選取 enblend.exe"
 
-#~ msgid "No enblend.exe selected"
-#~ msgstr "沒有選取 enblend.exe"
+msgid "No enblend.exe selected"
+msgstr "沒有選取 enblend.exe"
 
-#~ msgid "Select enblend commandline tool"
-#~ msgstr "選取 Enblend 指令串工具"
+msgid "Select enblend commandline tool"
+msgstr "選取 Enblend 指令串工具"
 
-#~ msgid "No enblend commandline tool selected"
-#~ msgstr "沒有選取 Enblend 指令串工具"
+msgid "No enblend commandline tool selected"
+msgstr "沒有選取 Enblend 指令串工具"
 
-#~ msgid ""
-#~ "Can not call enblend with a command line > 32766 characters.\n"
-#~ "This is a Windows limitation\n"
-#~ "Please use less images, or place the images in a folder with\n"
-#~ "a shorter pathname"
-#~ msgstr ""
-#~ "無法使用一個長度 > 32766 字符的指令串來調用 enblend.\n"
-#~ "這是Windows 系統的限制\n"
-#~ "請使用較少圖片, 或者將圖片放在\n"
-#~ "一個具有較短目錄名的檔案夾中"
+msgid ""
+"Can not call enblend with a command line > 32766 characters.\n"
+"This is a Windows limitation\n"
+"Please use less images, or place the images in a folder with\n"
+"a shorter pathname"
+msgstr ""
+"無法使用一個長度 > 32766 字符的指令串來調用 enblend.\n"
+"這是Windows 系統的限制\n"
+"請使用較少圖片, 或者將圖片放在\n"
+"一個具有較短目錄名的檔案夾中"
 
-#~ msgid "enblend error"
-#~ msgstr "Enblend 錯誤"
+msgid "enblend error"
+msgstr "Enblend 錯誤"
 
-#~ msgid "gamma must be a number"
-#~ msgstr "伽瑪必須是一個數字"
+msgid "gamma must be a number"
+msgstr "伽瑪必須是一個數字"
 
-#~ msgid "Not yet implemented"
-#~ msgstr "尚未執行"
+msgid "Not yet implemented"
+msgstr "尚未執行"
 
-#~ msgid "Delete autopano setting"
-#~ msgstr "刪除 Autopano 設定"
+msgid "Delete autopano setting"
+msgstr "刪除 Autopano 設定"
 
-#~ msgid "Bicubic"
-#~ msgstr "雙三次"
+msgid "Bicubic"
+msgstr "雙三次"
 
-#~ msgid "Nearest neighbour"
-#~ msgstr "鄰近像素"
+msgid "Nearest neighbour"
+msgstr "鄰近像素"
 
-#~ msgid ""
-#~ "PTStitcher does not support output filenames that include a dot character "
-#~ "(.).\n"
-#~ "Please save your projects in a directory without dot in the pathname.\n"
-#~ "\n"
-#~ "Do you want to continue anyway?"
-#~ msgstr ""
-#~ "PTStitcher 不支持輸出包含點 (.) 字符的檔案名.\n"
-#~ "請將您的專案儲存到一個不包含點字符的目錄名稱中.\n"
-#~ "\n"
-#~ "確定繼續嗎?"
+msgid ""
+"PTStitcher does not support output filenames that include a dot character "
+"(.).\n"
+"Please save your projects in a directory without dot in the pathname.\n"
+"\n"
+"Do you want to continue anyway?"
+msgstr ""
+"PTStitcher 不支持輸出包含點 (.) 字符的檔案名.\n"
+"請將您的專案儲存到一個不包含點字符的目錄名稱中.\n"
+"\n"
+"確定繼續嗎?"
 
-#~ msgid "PTStitcher problem"
-#~ msgstr "PTStitcher 問題"
+msgid "PTStitcher problem"
+msgstr "PTStitcher 問題"
 
-#~ msgid "PTStitcher.exe does not support QTVR output on Windows and Linux"
-#~ msgstr "PTStitcher.exe 在 Windows 和 Linux 系統下不支持 QTVR 輸出"
+msgid "PTStitcher.exe does not support QTVR output on Windows and Linux"
+msgstr "PTStitcher.exe 在 Windows 和 Linux 系統下不支持 QTVR 輸出"
 
-#~ msgid "PTStitcher note"
-#~ msgstr "PTStitcher 注釋"
+msgid "PTStitcher note"
+msgstr "PTStitcher 注釋"
 
-#~ msgid "Select PTStitcher.exe"
-#~ msgstr "選取 PTStitcher.exe"
+msgid "Select PTStitcher.exe"
+msgstr "選取 PTStitcher.exe"
 
-#~ msgid "No PTStitcher.exe selected"
-#~ msgstr "未選取 PTStitcher.exe"
+msgid "No PTStitcher.exe selected"
+msgstr "未選取 PTStitcher.exe"
 
-#~ msgid "Select PTStitcher commandline tool"
-#~ msgstr "選取 PTStitcher 指令串工具"
+msgid "Select PTStitcher commandline tool"
+msgstr "選取 PTStitcher 指令串工具"
 
-#~ msgid "No PTStitcher commandline tool selected"
-#~ msgstr "沒有選取 PTStitcher 指令串工具"
+msgid "No PTStitcher commandline tool selected"
+msgstr "沒有選取 PTStitcher 指令串工具"
 
-#~ msgid ""
-#~ "Warning: PTmender (from panotools 2.9 or later) only supports TIFF_m "
-#~ "output.\n"
-#~ "For color and brightness correction, the resulting tiff files must be "
-#~ "processed with PTblender.\n"
-#~ "\n"
-#~ "Continue anyway?"
-#~ msgstr ""
-#~ "注意: PTmender (panotools 2.9 或者升級版) 只支持 TIFF_m 輸出.\n"
-#~ "為了顏色和亮度校正, tiff 結果檔案必須使用 PTblender 進行處理.\n"
-#~ "\n"
-#~ "確定繼續?"
+msgid ""
+"Warning: PTmender (from panotools 2.9 or later) only supports TIFF_m "
+"output.\n"
+"For color and brightness correction, the resulting tiff files must be "
+"processed with PTblender.\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"注意: PTmender (panotools 2.9 或者升級版) 只支持 TIFF_m 輸出.\n"
+"為了顏色和亮度校正, tiff 結果檔案必須使用 PTblender 進行處理.\n"
+"\n"
+"確定繼續?"
 
-#~ msgid "PTmender creates only plain TIFF_m files"
-#~ msgstr "PTmender 只創建無格式 TIFF_m 檔案"
+msgid "PTmender creates only plain TIFF_m files"
+msgstr "PTmender 只創建無格式 TIFF_m 檔案"
 
-#~ msgid "Failed to launch the PTStitcher."
-#~ msgstr "載入 PTStitcher 失敗."
+msgid "Failed to launch the PTStitcher."
+msgstr "載入 PTStitcher 失敗."
 
-#~ msgid "Could not obtain PTStitcher output"
-#~ msgstr "無法獲得 PTStitcher 輸出"
+msgid "Could not obtain PTStitcher output"
+msgstr "無法獲得 PTStitcher 輸出"
 
-#~ msgid ""
-#~ "Stitching failed\n"
-#~ "PTStitcher exited with nonzero error code."
-#~ msgstr ""
-#~ "接合失敗\n"
-#~ "PTStitcher 帶有非零錯誤碼退出."
+msgid ""
+"Stitching failed\n"
+"PTStitcher exited with nonzero error code."
+msgstr ""
+"接合失敗\n"
+"PTStitcher 帶有非零錯誤碼退出."
 
-#~ msgid "Error executing %s"
-#~ msgstr "執行 %s 發生錯誤"
+msgid "Error executing %s"
+msgstr "執行 %s 發生錯誤"
 
-#~ msgid "Use alternative Autopano-SIFT program"
-#~ msgstr "使用可選 Autopano-SIFT 應用程式"
+msgid "Use alternative Autopano-SIFT program"
+msgstr "使用可選 Autopano-SIFT 應用程式"
 
-#~ msgid "Text mode"
-#~ msgstr "文本模式"
+msgid "Text mode"
+msgstr "文本模式"
 
-#~ msgid "Hugin Reference"
-#~ msgstr "Hugin 參考"
+msgid "Hugin Reference"
+msgstr "Hugin 參考"
 
-#~ msgid "Keyboard Shortcuts"
-#~ msgstr "鍵盤快捷鍵"
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤快捷鍵"
 
-#~ msgid "Optimizing"
-#~ msgstr "最佳化中"
+msgid "Optimizing"
+msgstr "最佳化中"
 
-#~ msgid "PTStitcher"
-#~ msgstr "PTStitcher"
+msgid "PTStitcher"
+msgstr "PTStitcher"
 
-#~ msgid "Abort"
-#~ msgstr "中斷"
+msgid "Abort"
+msgstr "中斷"
 
-#~ msgid "Choose which autopano program should be used\n"
-#~ msgstr "選取 Autopano 應用程式\n"
+msgid "Choose which autopano program should be used\n"
+msgstr "選取 Autopano 應用程式\n"
 
-#~ msgid "Autopano"
-#~ msgstr "Autopano"
+msgid "Autopano"
+msgstr "Autopano"
 
-#~ msgid ""
-#~ "These are the default arguments. They can be changed for individal "
-#~ "projects in the Stitcher tab.\n"
-#~ "Do not set -w, -o and --compression arguments, they are set by hugin"
-#~ msgstr ""
-#~ "這裡是默認指令碼. 可以為了單獨專案在[接合器]索引標籤中改變它們.\n"
-#~ "不要設定 -w, -o 和 --compression 指令碼, 它們由 hugin 指定"
+msgid ""
+"These are the default arguments. They can be changed for individal projects "
+"in the Stitcher tab.\n"
+"Do not set -w, -o and --compression arguments, they are set by hugin"
+msgstr ""
+"這裡是默認指令碼. 可以為了單獨專案在[接合器]索引標籤中改變它們.\n"
+"不要設定 -w, -o 和 --compression 指令碼, 它們由 hugin 指定"
 
-#~ msgid "Parameters for autopano program"
-#~ msgstr "Autopano 應用程式的參數"
+msgid "Parameters for autopano program"
+msgstr "Autopano 應用程式的參數"
 
-#~ msgid "Autopano program"
-#~ msgstr "Autopano 應用程式"
+msgid "Autopano program"
+msgstr "Autopano 應用程式"
 
-#~ msgid "Seam blending"
-#~ msgstr "融合接縫"
+msgid "Seam blending"
+msgstr "融合接縫"
 
-#~ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
-#~ msgstr "Autopano (1.03 版或者更新版本), 來自於 http://autopano.kolor.com"
+msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+msgstr "Autopano (1.03 版或者更新版本), 來自於 http://autopano.kolor.com"
 
-#~ msgid ""
-#~ "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
-#~ msgstr ""
-#~ "Autopano-SIFT, 來自於 http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+msgstr ""
+"Autopano-SIFT, 來自於 http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
 
-#~ msgid ""
-#~ "Finished running Celeste.\n"
-#~ "%d cloud-like control points removed."
-#~ msgstr ""
-#~ "已成功執行 Celeste.\n"
-#~ "%d 雲似的基準點已經被移除."
+msgid ""
+"Finished running Celeste.\n"
+"%d cloud-like control points removed."
+msgstr ""
+"已成功執行 Celeste.\n"
+"%d 雲似的基準點已經被移除."
 
-#~ msgid "Not a jpeg file:"
-#~ msgstr "這不是一個 jpeg 檔:"
+msgid "Not a jpeg file:"
+msgstr "這不是一個 jpeg 檔:"
 
-#~ msgid "Select Autopano-SIFT"
-#~ msgstr "選取 Autopano-SIFT"
+msgid "Select Autopano-SIFT"
+msgstr "選取 Autopano-SIFT"
 
-#~ msgid " is not in list."
-#~ msgstr " 不在列表中."
+msgid " is not in list."
+msgstr " 不在列表中."
 
-#~ msgid "File"
-#~ msgstr "檔案"
+msgid "File"
+msgstr "檔案"
 
-#~ msgid "Help"
-#~ msgstr "幫助"
+msgid "Help"
+msgstr "幫助"
 
-#~ msgid "Error: Could not remove temporary file"
-#~ msgstr "錯誤: 無法移除暫存檔"
+msgid "Error: Could not remove temporary file"
+msgstr "錯誤: 無法移除暫存檔"
 
-#~ msgid "For panoramas consisting of images with similar exposure"
-#~ msgstr "為圖片組成的全景圖片套用類似光圈"
+msgid "For panoramas consisting of images with similar exposure"
+msgstr "為圖片組成的全景圖片套用類似光圈"
 
-#~ msgid "Output remapped images with exposure correction"
-#~ msgstr "輸出使用光圈校正的重定位圖片"
+msgid "Output remapped images with exposure correction"
+msgstr "輸出使用光圈校正的重定位圖片"
 
-#~ msgid "Exposure Blending"
-#~ msgstr "演算融合光圈"
+msgid "Exposure Blending"
+msgstr "演算融合光圈"
 
-#~ msgid "For panoramas consisting of images with varying exposure"
-#~ msgstr "為圖片組成的全景圖片使用不同光圈"
+msgid "For panoramas consisting of images with varying exposure"
+msgstr "為圖片組成的全景圖片使用不同光圈"
 
-#~ msgid "Blended panorama (enfuse)"
-#~ msgstr "融合後的全景圖片 (enfuse)"
+msgid "Blended panorama (enfuse)"
+msgstr "融合後的全景圖片 (enfuse)"
 
-#~ msgid "Fully automatic exposure blending"
-#~ msgstr "完全自動演算融合光圈"
+msgid "Fully automatic exposure blending"
+msgstr "完全自動演算融合光圈"
 
-#~ msgid "Blended HDR panorama"
-#~ msgstr "融合後的 HDR 全景圖片"
+msgid "Blended HDR panorama"
+msgstr "融合後的 HDR 全景圖片"
 
-#~ msgid "Output a blended high dynamic range panorama"
-#~ msgstr "輸出一張融合後的高動態範圍的全景圖片"
+msgid "Output a blended high dynamic range panorama"
+msgstr "輸出一張融合後的高動態範圍的全景圖片"
 
-#~ msgid "Stacked HDR images"
-#~ msgstr "堆棧後的 HDR 圖片"
+msgid "Stacked HDR images"
+msgstr "堆棧後的 HDR 圖片"
 
-#~ msgid "Output the individual, remapped HDR stacks"
-#~ msgstr "輸出單獨的, 重定位的 HDR 棧"
+msgid "Output the individual, remapped HDR stacks"
+msgstr "輸出單獨的, 重定位的 HDR 棧"
 
-#~ msgid "Individual non merged images"
-#~ msgstr "單獨的沒有合併的圖片"
+msgid "Individual non merged images"
+msgstr "單獨的沒有合併的圖片"
 
-#~ msgid "Autopano-SIFT (by S. Nowozin)"
-#~ msgstr "Autopano-SIFT (作者  S. Nowozin)"
+msgid "Autopano-SIFT (by S. Nowozin)"
+msgstr "Autopano-SIFT (作者  S. Nowozin)"
 
-#~ msgid "Autopano-SIFT:"
-#~ msgstr "Autopano-SIFT:"
+msgid "Autopano-SIFT:"
+msgstr "Autopano-SIFT:"
 
-#~ msgid "Autopano:"
-#~ msgstr "Autopano:"
+msgid "Autopano:"
+msgstr "Autopano:"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5031
          http://hugin.svn.sourceforge.net/hugin/?rev=5031&view=rev
Author:   harryvanderwolf
Date:     2010-02-28 11:20:27 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
[OSX] update CPDetectorConfig_default.h to latest "insights"

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h

Modified: hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h	2010-02-27 20:35:57 UTC (rev 5030)
+++ hugin/trunk/src/hugin1/hugin/CPDetectorConfig_default.h	2010-02-28 11:20:27 UTC (rev 5031)
@@ -85,8 +85,11 @@
     {CPDetector_AutoPanoSift,wxT("Align image stack"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
   #else
+    {CPDetector_AutoPanoSift,wxT("Pablo's patent free Panomatic"),wxT("patfree-panomatic"),wxT("--sieve1size 20 --sieve2size 2 -o %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
     {CPDetector_AutoPanoSift,wxT("Align_image_stack linear"),wxT("align_image_stack"),wxT("-f %v -p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
-    {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
+    {CPDetector_AutoPanoSift,wxT("Align_image_stack FullFrameFisheye"),wxT("align_image_stack"),wxT("-f %v -p -e %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Autopano-SIFT-C"),wxT("== Use the Choose button to search for it =="),wxT("--maxmatches %p %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true},
+    {CPDetector_AutoPanoSift,wxT("Panomatic"),wxT("== Use the Choose button to search for it =="),wxT("-o %o %i"),wxT(""),wxT(""), wxT(""), wxT(""), true}
   #endif
 #endif
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5029
          http://hugin.svn.sourceforge.net/hugin/?rev=5029&view=rev
Author:   vatoz
Date:     2010-02-27 11:57:19 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Updated Czcech translation

Modified Paths:
--------------
    hugin/trunk/src/translations/cs_CZ.po

Modified: hugin/trunk/src/translations/cs_CZ.po
===================================================================
--- hugin/trunk/src/translations/cs_CZ.po	2010-02-27 04:31:03 UTC (rev 5028)
+++ hugin/trunk/src/translations/cs_CZ.po	2010-02-27 11:57:19 UTC (rev 5029)
@@ -27,10 +27,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cs_CZ\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
-"group_id=77506&atid=550441\n"
-"POT-Creation-Date: 2010-01-29 22:43+0100\n"
-"PO-Revision-Date: 2009-12-13 19:25+0100\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=77506&atid=550441\n"
+"POT-Creation-Date: 2010-02-27 10:37+0100\n"
+"PO-Revision-Date: 2010-02-27 12:52+0100\n"
 "Last-Translator: Václav Černý <vatoz@..."
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
@@ -41,50 +40,66 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82
+#: hugin_base/huginapp/ImageCache.cpp:661
+#: hugin1/base_wx/ImageCache.cpp:691
+msgid "Cannot load image: "
+msgstr "Nelze nahrát obrázek: "
+
+#: 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 ""
-"Externí program %s nenalezen (tak jak byl uložen v nastavení) , vracím se k "
-"přibalené verzi"
+msgid "External program %s not found as specified in preferences, reverting to bundled version"
+msgstr "Externí program %s nenalezen (tak jak byl uložen v nastavení) , vracím se k přibalené verzi"
 
-#: 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/RunStitchPanel.cpp:251 hugin1/hugin/AssistantPanel.cpp:385
-#: hugin1/hugin/AssistantPanel.cpp:554 hugin1/hugin/AssistantPanel.cpp:583
+#: 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/RunStitchPanel.cpp:251
+#: hugin1/hugin/AssistantPanel.cpp:385
+#: hugin1/hugin/AssistantPanel.cpp:554
+#: hugin1/hugin/AssistantPanel.cpp:583
 #: hugin1/hugin/AssistantPanel.cpp:727
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:163
 #: hugin1/hugin/CPEditorPanel.cpp:2142
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:503
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:523
-#: hugin1/hugin/PanoPanel.cpp:962 hugin1/ptbatcher/ProjectListBox.cpp:171
+#: hugin1/hugin/PanoPanel.cpp:970
+#: hugin1/ptbatcher/ProjectListBox.cpp:171
 msgid "Error"
 msgstr "Chyba"
 
-#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69
+#: hugin1/base_wx/huginConfig.cpp:57
+#: hugin1/base_wx/huginConfig.cpp:69
 #: hugin1/base_wx/RunStitchPanel.cpp:251
 #, c-format
 msgid "External program %s not found in the bundle, reverting to system path"
 msgstr "Externí program %s nenalezen v balíku, vracím se k systémové cestě"
 
-#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109
+#: 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 ""
-"Externí program %s nenalezen (tak jak byl uložen v nastavení) , vracím se k "
-"původnímu nastavení"
+msgstr "Externí program %s nenalezen (tak jak byl uložen v nastavení) , vracím se k původnímu nastavení"
 
-#: 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/hugin/CPDetectorConfig.cpp:307 hugin1/hugin/GLPreviewFrame.cpp:851
-#: hugin1/hugin/GLPreviewFrame.cpp:859 hugin1/hugin/GLPreviewFrame.cpp:867
+#: 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/hugin/CPDetectorConfig.cpp:307
+#: hugin1/hugin/GLPreviewFrame.cpp:851
+#: hugin1/hugin/GLPreviewFrame.cpp:859
+#: hugin1/hugin/GLPreviewFrame.cpp:867
 #: hugin1/hugin/PreferencesDialog.cpp:811
 msgid "Warning"
 msgstr "Varování"
@@ -99,10 +114,6 @@
 msgid "Error reading image: %s"
 msgstr "Chyba při nahrávání obrázku: %s"
 
-#: hugin1/base_wx/ImageCache.cpp:691 hugin_base/huginapp/ImageCache.cpp:661
-msgid "Cannot load image: "
-msgstr "Nelze nahrát obrázek: "
-
 #: hugin1/base_wx/ImageCache.cpp:719
 #, c-format
 msgid "Scaling image %s"
@@ -135,9 +146,15 @@
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:602
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:123 translations/xrc.cpp:139
-#: translations/xrc.cpp:692 translations/xrc.cpp:781 xrc.cpp:139 xrc.cpp:692
-#: xrc.cpp:781
+#: hugin1/stitch_project/hugin_stitch_project.cpp:123
+#: translations/xrc.cpp:134
+#: translations/xrc.cpp:417
+#: translations/xrc.cpp:688
+#: translations/xrc.cpp:776
+#: xrc.cpp:134
+#: xrc.cpp:417
+#: xrc.cpp:688
+#: xrc.cpp:776
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -154,21 +171,14 @@
 msgstr "Optimalizuji panorama"
 
 #: hugin1/base_wx/platform.h:39
-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 ""
-"všechny obrázky|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*."
-"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|"
-"JPG obrázky (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF obrázky (*.tif,*."
-"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG obrázky (*.png)|*.png;*.PNG|HDR obrázky "
-"(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Všechny soubory (*)|*"
+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 "všechny obrázky|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPG obrázky (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF obrázky (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG obrázky (*.png)|*.png;*.PNG|HDR obrázky (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Všechny soubory (*)|*"
 
-#: hugin1/base_wx/PTWXDlg.cpp:47 hugin1/base_wx/PTWXDlg.cpp:65
-#: hugin1/base_wx/PTWXDlg.cpp:117 translations/xrc.cpp:694 xrc.cpp:694
+#: hugin1/base_wx/PTWXDlg.cpp:47
+#: hugin1/base_wx/PTWXDlg.cpp:65
+#: hugin1/base_wx/PTWXDlg.cpp:117
+#: translations/xrc.cpp:690
+#: xrc.cpp:690
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
@@ -176,19 +186,22 @@
 msgid "Could not open project file:"
 msgstr "Nelze otevřít projektový soubor:"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:118 hugin1/nona_gui/nona_gui.cpp:232
+#: hugin1/base_wx/RunStitchPanel.cpp:118
+#: hugin1/nona_gui/nona_gui.cpp:232
 #: hugin1/ptbatcher/ProjectArray.cpp:84
 #, c-format
 msgid "could not open script : %s"
 msgstr "nelze otevřít skript: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:139 hugin1/nona_gui/nona_gui.cpp:239
+#: hugin1/base_wx/RunStitchPanel.cpp:139
+#: hugin1/nona_gui/nona_gui.cpp:239
 #: hugin1/ptbatcher/ProjectArray.cpp:107
 #, c-format
 msgid "error while parsing panotools script: %s"
 msgstr "chyba při parsování panotools skriptu: %s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:178 hugin1/base_wx/RunStitchPanel.cpp:195
+#: hugin1/base_wx/RunStitchPanel.cpp:178
+#: hugin1/base_wx/RunStitchPanel.cpp:195
 msgid "Could not create temporary file"
 msgstr "Nelze vytvořit dočasný soubor"
 
@@ -218,7 +231,8 @@
 "Chyba při slepování projektu\n"
 "%s"
 
-#: hugin1/base_wx/RunStitchPanel.cpp:262 hugin1/base_wx/RunStitchPanel.cpp:268
+#: hugin1/base_wx/RunStitchPanel.cpp:262
+#: hugin1/base_wx/RunStitchPanel.cpp:268
 #: hugin1/ptbatcher/RunStitchFrame.cpp:120
 #: hugin1/stitch_project/hugin_stitch_project.cpp:172
 msgid "Error during stitching"
@@ -244,9 +258,7 @@
 msgstr "nalezeno %d nepropojených skupin obrázků: "
 
 #: hugin1/hugin/AssistantPanel.cpp:321
-msgid ""
-"Please use the Control Points tab to connect all images with control "
-"points.\n"
+msgid "Please use the Control Points tab to connect all images with control points.\n"
 msgstr "Využijte záložku s kontrolními body pro propojení všech obrázků.\n"
 
 #: hugin1/hugin/AssistantPanel.cpp:324
@@ -262,22 +274,12 @@
 msgstr "Dobré spasování."
 
 #: hugin1/hugin/AssistantPanel.cpp:339
-msgid ""
-"Bad fit, some control points might be bad, or there are parallax and "
-"movement errors"
-msgstr ""
-"Špatné spasování. Některé kontrolní body mohou být chybné, nebo se "
-"fotografovaná scéna či umístění fotoaparátu mezi fotografiemi příliš měnilo"
+msgid "Bad fit, some control points might be bad, or there are parallax and movement errors"
+msgstr "Špatné spasování. Některé kontrolní body mohou být chybné, nebo se fotografovaná scéna či umístění fotoaparátu mezi fotografiemi příliš měnilo"
 
 #: hugin1/hugin/AssistantPanel.cpp:341
-msgid ""
-"Very bad fit. Check for bad control points, lens parameters, or images with "
-"parallax or movement. The optimizer might have failed. Manual intervention "
-"required."
-msgstr ""
-"Velmi špatné spasování. Zkontrolujte kontrolní body, parametry objektivů, "
-"nebo obrázky focené z jiného místa.  Možná také selhala optimalizace. "
-"Manuální zásah nutný."
+msgid "Very bad fit. Check for bad control points, lens parameters, or images with parallax or movement. The optimizer might have failed. Manual intervention required."
+msgstr "Velmi špatné spasování. Zkontrolujte kontrolní body, parametry objektivů, nebo obrázky focené z jiného místa.  Možná také selhala optimalizace. Manuální zásah nutný."
 
 #: hugin1/hugin/AssistantPanel.cpp:343
 #, c-format
@@ -285,13 +287,8 @@
 msgstr "Střední chyba po optimalizaci: %.1f pixelů, maximální: %.1f\n"
 
 #: hugin1/hugin/AssistantPanel.cpp:351
-msgid ""
-"Note: automatic alignment uses default settings from the preferences. If you "
-"customize settings for this project in the advanced tabs and want to use "
-"these customized settings, run the CP detection from the Images Tab, the "
-"geometrical optimization from the the Optimizer tab and the photometric "
-"optimization from the Exposure tab."
-msgstr ""
+msgid "Note: automatic alignment uses default settings from the preferences. If you customize settings for this project in the advanced tabs and want to use these customized settings, run the CP detection from the Images Tab, the geometrical optimization from the the Optimizer tab and the photometric optimization from the Exposure tab."
+msgstr "Poznámka: Automatické zarovnávání používá výchozí nastavení.  Pokud změníte nastavení pro tento projekt v pokročilejších panelech a budete chtít použít toto pozměněné nastavení, spusťte detektor kontrolních bodů ze záložky obrázky, optimalizaci ze záložky optimalizátor a fotometrickou optimalizaci ze záložky Expozice."
 
 #: hugin1/hugin/AssistantPanel.cpp:385
 msgid ""
@@ -309,27 +306,35 @@
 msgid "Finding corresponding points"
 msgstr "Hledám odpovídající body"
 
-#: hugin1/hugin/AssistantPanel.cpp:421 hugin1/hugin/AssistantPanel.cpp:436
-#: hugin1/hugin/CPEditorPanel.cpp:2146 hugin1/hugin/CPEditorPanel.cpp:2195
-#: hugin1/hugin/CPEditorPanel.cpp:2205 hugin1/hugin/CPEditorPanel.cpp:2230
-#: hugin1/hugin/ImagesPanel.cpp:1001 hugin1/hugin/ImagesPanel.cpp:1019
+#: hugin1/hugin/AssistantPanel.cpp:421
+#: hugin1/hugin/AssistantPanel.cpp:436
+#: hugin1/hugin/CPEditorPanel.cpp:2146
+#: hugin1/hugin/CPEditorPanel.cpp:2195
+#: hugin1/hugin/CPEditorPanel.cpp:2205
+#: hugin1/hugin/CPEditorPanel.cpp:2230
+#: hugin1/hugin/ImagesPanel.cpp:1001
+#: hugin1/hugin/ImagesPanel.cpp:1019
 msgid "Running Celeste"
 msgstr "Spouštím Celeste"
 
-#: hugin1/hugin/AssistantPanel.cpp:491 hugin1/hugin/CPEditorPanel.cpp:2148
+#: hugin1/hugin/AssistantPanel.cpp:491
+#: hugin1/hugin/CPEditorPanel.cpp:2148
 #: hugin1/hugin/ImagesPanel.cpp:1078
 msgid "searching for cloud-like control points..."
 msgstr "hledám mrakům podobné body..."
 
 #: hugin1/hugin/AssistantPanel.cpp:519
 msgid "Celeste model file not found, Hugin needs to be properly installed."
-msgstr ""
-"Soubor s modelem pro Celeste nenalezen, Hugin musí být patřičně nainstalován."
+msgstr "Soubor s modelem pro Celeste nenalezen, Hugin musí být patřičně nainstalován."
 
-#: hugin1/hugin/AssistantPanel.cpp:519 hugin1/hugin/CPEditorPanel.cpp:2186
-#: hugin1/hugin/huginApp.cpp:146 hugin1/hugin/huginApp.cpp:158
-#: hugin1/hugin/huginApp.cpp:171 hugin1/hugin/ImagesPanel.cpp:1013
-#: hugin1/ptbatcher/PTBatcherGUI.cpp:71 hugin1/ptbatcher/PTBatcherGUI.cpp:77
+#: hugin1/hugin/AssistantPanel.cpp:519
+#: hugin1/hugin/CPEditorPanel.cpp:2186
+#: hugin1/hugin/huginApp.cpp:147
+#: hugin1/hugin/huginApp.cpp:159
+#: hugin1/hugin/huginApp.cpp:172
+#: hugin1/hugin/ImagesPanel.cpp:1013
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:71
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:77
 #: hugin1/ptbatcher/PTBatcherGUI.cpp:101
 #: hugin1/stitch_project/hugin_stitch_project.cpp:277
 msgid "Fatal Error"
@@ -339,20 +344,20 @@
 msgid "Checking for outlying control points"
 msgstr "Hledám nezapadající kontrolní body"
 
-#: hugin1/hugin/AssistantPanel.cpp:553 hugin1/hugin/AssistantPanel.cpp:582
+#: hugin1/hugin/AssistantPanel.cpp:553
+#: hugin1/hugin/AssistantPanel.cpp:582
 #, c-format
 msgid "Warning %d unconnected image groups found:"
 msgstr "Pozor.  Nalezeno %d nepropojených skupin obrázků:"
 
-#: hugin1/hugin/AssistantPanel.cpp:554 hugin1/hugin/AssistantPanel.cpp:583
+#: hugin1/hugin/AssistantPanel.cpp:554
+#: hugin1/hugin/AssistantPanel.cpp:583
 msgid ""
-"Please create control points between unconnected images using the Control "
-"Points tab.\n"
+"Please create control points between unconnected images using the Control Points tab.\n"
 "\n"
 "After adding the points, press the \"Align\" button again"
 msgstr ""
-"Prosím vytvořte kontrolní body mezi nepropojenými obrázky v záložce "
-"Kontrolní body.\n"
+"Prosím vytvořte kontrolní body mezi nepropojenými obrázky v záložce Kontrolní body.\n"
 "\n"
 "Po přidání bodů stiskněte tlačítko \"Zarovnat\""
 
@@ -382,30 +387,25 @@
 #, c-format
 msgid ""
 "Could not find \"%s\" in path.\n"
-"Maybe you have not installed it properly or given a wrong path in the "
-"settings."
+"Maybe you have not installed it properly or given a wrong path in the settings."
 msgstr ""
 "V cestě nelze najít \"%s\".\n"
 "Možná není nainstalováno  správně nebo je zadána špatná cesta."
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:314
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:320
 #, c-format
-msgid ""
-"Please use  %namefile, %i or %s to specify the input files for control point "
-"detector"
-msgstr ""
-"Používejte prosím %namefile, %i nebo %s k určení vstupních souborů pro "
-"detektor kontrolních bodů."
+msgid "Please use  %namefile, %i or %s to specify the input files for control point detector"
+msgstr "Používejte prosím %namefile, %i nebo %s k určení vstupních souborů pro detektor kontrolních bodů."
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:315
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:460
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:321
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:466
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:472
 msgid "Error in control point detector command"
 msgstr "Chyba během vytváření kontrolních bodů"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:363
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:544
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:650
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:369
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:550
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:656
 msgid ""
 "Command line for control point detector too long.\n"
 "This is a windows limitation\n"
@@ -417,14 +417,14 @@
 "Vyberte, prosím, méně obrázků nebo vložte obrázky do složky\n"
 "s kratším jménem"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:364
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:545
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:651
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:370
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:551
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:657
 msgid "Too many images selected"
 msgstr "Vybráno příliš mnoha obrázků"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:377
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:662
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:383
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:668
 #, c-format
 msgid ""
 "Too many arguments (images). Try using the %%s parameter in preferences.\n"
@@ -435,38 +435,38 @@
 "\n"
 "Nemohu spustit příkaz: %s"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:377
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:388
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:393
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:500
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:508
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:561
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:573
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:581
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:662
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:673
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:678
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:383
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:394
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:399
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:506
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:514
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:567
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:579
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:587
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:668
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:679
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:684
 msgid "wxExecute Error"
 msgstr "chyba v wxExecute"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:383
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:566
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:668
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:389
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:572
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:674
 msgid "finding control points"
 msgstr "Hledám kontrolní body"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:388
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:500
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:573
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:673
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:394
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:506
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:579
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:679
 #, c-format
 msgid "Could not execute command: %s"
 msgstr "Nelze spustit příkaz:   %s"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:392
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:507
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:580
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:677
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:398
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:513
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:586
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:683
 #, c-format
 msgid ""
 "Command: %s\n"
@@ -475,9 +475,9 @@
 "Příkaz: %s\n"
 "skončil s chybovým kódem: %d"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:398
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:587
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:685
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:404
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:593
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:691
 #, c-format
 msgid ""
 "Could not open %s for reading\n"
@@ -492,40 +492,32 @@
 "\n"
 "Spouštěný příkaz:  %s"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:399
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:588
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:686
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:405
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:594
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:692
 msgid "Control point detector failure"
 msgstr "Chyba detektoru kontrolních bodů"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:459
-#, fuzzy
-msgid ""
-"Please use %i to specify the input files and %k to specify the keypoint file "
-"for generate keys step"
-msgstr ""
-"Používejte prosím %namefile, %i nebo %s k určení vstupních souborů pro "
-"detektor kontrolních bodů."
-
 #: hugin1/hugin/AutoCtrlPointCreator.cpp:465
-msgid ""
-"Please use %k to specify the keypoint files and %o to specify the output "
-"project file for the matching step"
-msgstr ""
+msgid "Please use %i to specify the input files and %k to specify the keypoint file for generate keys step"
+msgstr "Používejte prosím %i pro nastavení vstupních souborů a %k pro určení souboru s klíčovými body pro krok generování bodů"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:493
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:471
+msgid "Please use %k to specify the keypoint files and %o to specify the output project file for the matching step"
+msgstr "Užijte %k jako soubor s klíčovými body a  %o pro výstupní projekt pro krok spárování"
+
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:499
 msgid "generating key file"
-msgstr ""
+msgstr "generuji soubor s klíči"
 
-#: hugin1/hugin/AutoCtrlPointCreator.cpp:561
-#, fuzzy, c-format
+#: hugin1/hugin/AutoCtrlPointCreator.cpp:567
+#, c-format
 msgid ""
-"Too many arguments (images). Try using a cp generator setting which supports "
-"the %%s parameter in preferences.\n"
+"Too many arguments (images). Try using a cp generator setting which supports the %%s parameter in preferences.\n"
 "\n"
 " Could not execute command: %s"
 msgstr ""
-"Příliš mnoho argumentů (obrázků). Zkuste použít parametr %%s v nastavení.\n"
+"Příliš mnoho argumentů (obrázků). Zkuste použít nastavení generátoru kontrolních bodů, které podporuje  parametr %%s v nastavení.\n"
 "\n"
 "Nemohu spustit příkaz: %s"
 
@@ -559,24 +551,24 @@
 
 #: hugin1/hugin/CPDetectorConfig.cpp:385
 msgid "Try to connect all overlapping images."
-msgstr ""
+msgstr "Pokouším se propojit všechny překrývající obrázky."
 
 #: hugin1/hugin/CPDetectorConfig.cpp:391
-#, fuzzy
 msgid "Only work on image pairs without control points."
-msgstr "Nelze odhadnout umístění obrázku bez kontrolních bodů"
+msgstr "Pracuje pouze na dvojicích obrázků bez kontrolních bodů."
 
 #: hugin1/hugin/CPDetectorConfig.cpp:413
-#, fuzzy
 msgid "Select control point detector program"
-msgstr "Smaže nastavení detektoru kontrolních bodů"
+msgstr "Vyberte detektor kontrolních bodů"
 
 #: hugin1/hugin/CPDetectorConfig.cpp:421
 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"
 msgstr "Spustitelné (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"
 
-#: hugin1/hugin/CPEditorPanel.cpp:223 hugin1/hugin/CPListFrame.cpp:283
+#: hugin1/hugin/CPEditorPanel.cpp:223
+#: hugin1/hugin/CPListFrame.cpp:283
 #: hugin1/hugin/ImagesList.cpp:71
+#: hugin1/hugin/MaskEditorPanel.cpp:100
 msgid "#"
 msgstr "#"
 
@@ -596,12 +588,14 @@
 msgid "right y"
 msgstr "pravá y"
 
-#: hugin1/hugin/CPEditorPanel.cpp:228 hugin1/hugin/CPListFrame.cpp:290
+#: hugin1/hugin/CPEditorPanel.cpp:228
+#: hugin1/hugin/CPListFrame.cpp:290
 #: hugin1/hugin/CPListFrame.cpp:297
 msgid "Alignment"
 msgstr "zarovnání"
 
-#: hugin1/hugin/CPEditorPanel.cpp:229 hugin1/hugin/CPListFrame.cpp:291
+#: hugin1/hugin/CPEditorPanel.cpp:229
+#: hugin1/hugin/CPListFrame.cpp:291
 #: hugin1/hugin/CPListFrame.cpp:298
 msgid "Distance"
 msgstr "vzdálenost"
@@ -614,25 +608,25 @@
 msgid "new control point added"
 msgstr "Přidán nový kontrolní bod"
 
-#: hugin1/hugin/CPEditorPanel.cpp:763 hugin1/hugin/CPEditorPanel.cpp:988
+#: hugin1/hugin/CPEditorPanel.cpp:763
+#: hugin1/hugin/CPEditorPanel.cpp:988
 msgid "searching similar points..."
 msgstr "hledám podobné body..."
 
-#: hugin1/hugin/CPEditorPanel.cpp:782 hugin1/hugin/CPEditorPanel.cpp:906
+#: hugin1/hugin/CPEditorPanel.cpp:782
+#: hugin1/hugin/CPEditorPanel.cpp:906
 msgid "Error during Fine-tune"
 msgstr "Chyba během dolaďování"
 
-#: hugin1/hugin/CPEditorPanel.cpp:796 hugin1/hugin/CPEditorPanel.cpp:926
+#: hugin1/hugin/CPEditorPanel.cpp:796
+#: hugin1/hugin/CPEditorPanel.cpp:926
 #: hugin1/hugin/CPEditorPanel.cpp:1062
 #, c-format
-msgid ""
-"Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
-"%0.3f %0.3f "
-msgstr ""
-"Bod doladěn, úhel: %.0f st., korelační koeficient: %0.3f, zakřivení: %0.3f %"
-"0.3f "
+msgid "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: %0.3f %0.3f "
+msgstr "Bod doladěn, úhel: %.0f st., korelační koeficient: %0.3f, zakřivení: %0.3f %0.3f "
 
-#: hugin1/hugin/CPEditorPanel.cpp:799 hugin1/hugin/CPEditorPanel.cpp:929
+#: hugin1/hugin/CPEditorPanel.cpp:799
+#: hugin1/hugin/CPEditorPanel.cpp:929
 msgid "change points, or press right mouse button to add the pair"
 msgstr "Změňte body nebo stiskněte pravé tlačítko myši přidání páru"
 
@@ -644,8 +638,7 @@
 #, c-format
 msgid ""
 "No similar point found. Check the similarity visually.\n"
-"Correlation coefficient (%.3f) is lower than the threshold set in the "
-"preferences."
+"Correlation coefficient (%.3f) is lower than the threshold set in the preferences."
 msgstr ""
 "Nebyly nalezeny žádné podobné body. Zkuste je najít osobně.\n"
 "Korelační koeficient (%.3f) je nižší než nastavený práh."
@@ -654,27 +647,35 @@
 msgid "No similar point found"
 msgstr "Žádný odpovídající bod"
 
-#: hugin1/hugin/CPEditorPanel.cpp:1232 hugin1/hugin/CPEditorPanel.cpp:1243
+#: hugin1/hugin/CPEditorPanel.cpp:1232
+#: hugin1/hugin/CPEditorPanel.cpp:1243
 msgid "Add new Line"
 msgstr "Přidat novou přímku"
 
-#: hugin1/hugin/CPEditorPanel.cpp:1238 hugin1/hugin/CPEditorPanel.cpp:1241
-#: hugin1/hugin/CPEditorPanel.cpp:1579 hugin1/hugin/CPListFrame.cpp:417
+#: hugin1/hugin/CPEditorPanel.cpp:1238
+#: hugin1/hugin/CPEditorPanel.cpp:1241
+#: hugin1/hugin/CPEditorPanel.cpp:1579
+#: hugin1/hugin/CPListFrame.cpp:417
 #, c-format
 msgid "Line %d"
 msgstr "Přímka %d"
 
-#: hugin1/hugin/CPEditorPanel.cpp:1570 hugin1/hugin/CPListFrame.cpp:408
-#: hugin1/hugin/GLPreviewFrame.cpp:355 hugin1/hugin/PreviewFrame.cpp:227
-#: translations/xrc.cpp:148 xrc.cpp:148
+#: hugin1/hugin/CPEditorPanel.cpp:1570
+#: hugin1/hugin/CPListFrame.cpp:408
+#: hugin1/hugin/GLPreviewFrame.cpp:355
+#: hugin1/hugin/PreviewFrame.cpp:227
+#: translations/xrc.cpp:139
+#: xrc.cpp:139
 msgid "normal"
 msgstr "normální "
 
-#: hugin1/hugin/CPEditorPanel.cpp:1573 hugin1/hugin/CPListFrame.cpp:411
+#: hugin1/hugin/CPEditorPanel.cpp:1573
+#: hugin1/hugin/CPListFrame.cpp:411
 msgid "vert. Line"
 msgstr "svislá čára"
 
-#: hugin1/hugin/CPEditorPanel.cpp:1576 hugin1/hugin/CPListFrame.cpp:414
+#: hugin1/hugin/CPEditorPanel.cpp:1576
+#: hugin1/hugin/CPListFrame.cpp:414
 msgid "horiz. Line"
 msgstr "vodorovná čára"
 
@@ -696,8 +697,10 @@
 msgid "Corner Detection threshold"
 msgstr "Detekce prahu rohu"
 
-#: hugin1/hugin/CPEditorPanel.cpp:1899 hugin1/hugin/CPEditorPanel.cpp:1903
-#: translations/xrc.cpp:223 xrc.cpp:223
+#: hugin1/hugin/CPEditorPanel.cpp:1899
+#: hugin1/hugin/CPEditorPanel.cpp:1903
+#: translations/xrc.cpp:208
+#: xrc.cpp:208
 msgid "Create control points"
 msgstr "Vytvořit kontrolní body"
 
@@ -718,28 +721,29 @@
 msgstr "Vybrat bod v levém obrázku"
 
 #: hugin1/hugin/CPEditorPanel.cpp:2142
-msgid ""
-"Cannot run celeste without at least one control point connecting the two "
-"images"
-msgstr ""
-"Nelze spustit celeste bez alespoň jedné dvojice obrázků propojených "
-"kontrolními body."
+msgid "Cannot run celeste without at least one control point connecting the two images"
+msgstr "Nelze spustit celeste bez alespoň jedné dvojice obrázků propojených kontrolními body."
 
-#: hugin1/hugin/CPEditorPanel.cpp:2186 hugin1/hugin/ImagesPanel.cpp:1013
+#: hugin1/hugin/CPEditorPanel.cpp:2186
+#: hugin1/hugin/ImagesPanel.cpp:1013
 msgid "Celeste model expected in "
 msgstr "Model Celeste  očekáván v "
 
-#: hugin1/hugin/CPEditorPanel.cpp:2186 hugin1/hugin/ImagesPanel.cpp:1013
+#: hugin1/hugin/CPEditorPanel.cpp:2186
+#: hugin1/hugin/ImagesPanel.cpp:1013
 msgid " not found, Hugin needs to be properly installed."
 msgstr " nenalezen, Hugin musí být patřičně nainstalován."
 
-#: hugin1/hugin/CPEditorPanel.cpp:2232 hugin1/hugin/ImagesPanel.cpp:379
+#: hugin1/hugin/CPEditorPanel.cpp:2232
+#: hugin1/hugin/ImagesPanel.cpp:379
 #: hugin1/hugin/ImagesPanel.cpp:1114
+#: hugin1/hugin/MainFrame.cpp:1523
 #, c-format
 msgid "Removed %d control points"
 msgstr "Odebráno %d kontrolních bodů"
 
-#: hugin1/hugin/CPEditorPanel.cpp:2232 hugin1/hugin/ImagesPanel.cpp:1114
+#: hugin1/hugin/CPEditorPanel.cpp:2232
+#: hugin1/hugin/ImagesPanel.cpp:1114
 msgid "Celeste result"
 msgstr "Výsledky Celeste"
 
@@ -755,20 +759,23 @@
 msgid "Could not process event!"
 msgstr "Nelze provést událost!"
 
-#: hugin1/hugin/CPListFrame.cpp:284 hugin1/hugin/CPListFrame.cpp:294
+#: hugin1/hugin/CPListFrame.cpp:284
+#: hugin1/hugin/CPListFrame.cpp:294
 msgid "Left Img."
 msgstr "levý obr."
 
-#: hugin1/hugin/CPListFrame.cpp:285 hugin1/hugin/CPListFrame.cpp:288
-#: translations/xrc.cpp:25 translations/xrc.cpp:47 xrc.cpp:25 xrc.cpp:47
+#: hugin1/hugin/CPListFrame.cpp:285
+#: hugin1/hugin/CPListFrame.cpp:288
 msgid "x"
 msgstr "x"
 
-#: hugin1/hugin/CPListFrame.cpp:286 hugin1/hugin/CPListFrame.cpp:289
+#: hugin1/hugin/CPListFrame.cpp:286
+#: hugin1/hugin/CPListFrame.cpp:289
 msgid "y"
 msgstr "y"
 
-#: hugin1/hugin/CPListFrame.cpp:287 hugin1/hugin/CPListFrame.cpp:295
+#: hugin1/hugin/CPListFrame.cpp:287
+#: hugin1/hugin/CPListFrame.cpp:295
 msgid "Right Img."
 msgstr "pravý obr."
 
@@ -792,8 +799,10 @@
 msgid "Select Control Points"
 msgstr "Vyberte kontrolní body"
 
-#: hugin1/hugin/CropPanel.cpp:265 hugin1/hugin/CropPanel.cpp:281
-#: hugin1/hugin/CropPanel.cpp:297 hugin1/hugin/CropPanel.cpp:313
+#: hugin1/hugin/CropPanel.cpp:265
+#: hugin1/hugin/CropPanel.cpp:281
+#: hugin1/hugin/CropPanel.cpp:297
+#: hugin1/hugin/CropPanel.cpp:313
 msgid "Please enter a valid number"
 msgstr "Vložte, prosím, číslo."
 
@@ -801,143 +810,192 @@
 msgid "Fast Panorama preview"
 msgstr "Rychlý náhled panoramatu"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:225 translations/xrc.cpp:704
-#: translations/xrc.cpp:711 xrc.cpp:704 xrc.cpp:711
+#: hugin1/hugin/GLPreviewFrame.cpp:225
+#: translations/xrc.cpp:699
+#: translations/xrc.cpp:706
+#: xrc.cpp:699
+#: xrc.cpp:706
 msgid "Center"
 msgstr "Vystředit"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:226 hugin1/hugin/GLPreviewFrame.cpp:228
-#: translations/xrc.cpp:714 xrc.cpp:714
+#: hugin1/hugin/GLPreviewFrame.cpp:226
+#: hugin1/hugin/GLPreviewFrame.cpp:228
+#: translations/xrc.cpp:709
+#: xrc.cpp:709
 msgid "Fit"
 msgstr "Přizpůsobit"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:227 translations/xrc.cpp:716 xrc.cpp:716
+#: hugin1/hugin/GLPreviewFrame.cpp:227
+#: translations/xrc.cpp:711
+#: xrc.cpp:711
 msgid "Straighten"
 msgstr "Narovnat"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:229 hugin1/hugin/GLPreviewFrame.cpp:1341
-#: hugin1/hugin/PanoPanel.cpp:921 translations/xrc.cpp:495 xrc.cpp:495
+#: hugin1/hugin/GLPreviewFrame.cpp:229
+#: hugin1/hugin/GLPreviewFrame.cpp:1344
+#: hugin1/hugin/PanoPanel.cpp:929
+#: translations/xrc.cpp:506
+#: xrc.cpp:506
 msgid "Autocrop"
 msgstr "Autoořez"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:234 hugin1/hugin/PreviewFrame.cpp:128
+#: hugin1/hugin/GLPreviewFrame.cpp:234
+#: hugin1/hugin/PreviewFrame.cpp:128
 msgid "displayed images"
 msgstr "zobrazené obrázky"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:259 translations/xrc.cpp:724 xrc.cpp:724
+#: hugin1/hugin/GLPreviewFrame.cpp:259
+#: translations/xrc.cpp:719
+#: xrc.cpp:719
 msgid "All"
 msgstr "Všechny"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:260 translations/xrc.cpp:544
-#: translations/xrc.cpp:552 translations/xrc.cpp:726 xrc.cpp:544 xrc.cpp:552
-#: xrc.cpp:726
+#: hugin1/hugin/GLPreviewFrame.cpp:260
+#: translations/xrc.cpp:551
+#: translations/xrc.cpp:554
+#: translations/xrc.cpp:721
+#: xrc.cpp:551
+#: xrc.cpp:554
+#: xrc.cpp:721
 msgid "None"
 msgstr "žádná"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:284 hugin1/hugin/PreviewFrame.cpp:165
+#: hugin1/hugin/GLPreviewFrame.cpp:284
+#: hugin1/hugin/PreviewFrame.cpp:165
 msgid "VFOV"
 msgstr "VFOV"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:288 hugin1/hugin/PreviewFrame.cpp:169
+#: hugin1/hugin/GLPreviewFrame.cpp:288
+#: hugin1/hugin/PreviewFrame.cpp:169
 msgid "drag to change the vertical field of view"
 msgstr "táhněte myší pro změnu svislého zorného pole"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:297 hugin1/hugin/PreviewFrame.cpp:178
+#: hugin1/hugin/GLPreviewFrame.cpp:297
+#: hugin1/hugin/PreviewFrame.cpp:178
 msgid "HFOV"
 msgstr "HFOV"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:302 hugin1/hugin/PreviewFrame.cpp:183
+#: hugin1/hugin/GLPreviewFrame.cpp:302
+#: hugin1/hugin/PreviewFrame.cpp:183
 msgid "drag to change the horizontal field of view"
 msgstr "táhněte myší pro změnu horizontálního zorného pole"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:393 hugin1/hugin/PreviewFrame.cpp:297
+#: hugin1/hugin/GLPreviewFrame.cpp:393
+#: hugin1/hugin/PreviewFrame.cpp:297
 msgid "Resets the projections parameters to their default values."
-msgstr ""
+msgstr "Obnoví parametry projekcí na výchozí hodnoty."
 
-#: hugin1/hugin/GLPreviewFrame.cpp:402 hugin1/hugin/PreviewFrame.cpp:306
+#: hugin1/hugin/GLPreviewFrame.cpp:402
+#: hugin1/hugin/PreviewFrame.cpp:306
 msgid "param:"
 msgstr "parametr:"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:407 hugin1/hugin/PreviewFrame.cpp:275
+#: hugin1/hugin/GLPreviewFrame.cpp:407
+#: hugin1/hugin/PreviewFrame.cpp:275
 msgid "0"
 msgstr "0"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:754 hugin1/hugin/PreviewFrame.cpp:609
+#: hugin1/hugin/GLPreviewFrame.cpp:754
+#: hugin1/hugin/PreviewFrame.cpp:609
 msgid "Rectilinear"
 msgstr "Rectilineární"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:755 hugin1/hugin/PreviewFrame.cpp:610
+#: hugin1/hugin/GLPreviewFrame.cpp:755
+#: hugin1/hugin/PreviewFrame.cpp:610
 msgid "Cylindrical"
 msgstr "Cylindrická"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:756 hugin1/hugin/ImagesList.cpp:524
-#: hugin1/hugin/PreviewFrame.cpp:611 translations/xrc.cpp:21
-#: translations/xrc.cpp:39 translations/xrc.cpp:256 xrc.cpp:21 xrc.cpp:39
-#: xrc.cpp:256
+#: hugin1/hugin/GLPreviewFrame.cpp:756
+#: hugin1/hugin/ImagesList.cpp:524
+#: hugin1/hugin/PreviewFrame.cpp:611
+#: translations/xrc.cpp:21
+#: translations/xrc.cpp:36
+#: translations/xrc.cpp:241
+#: xrc.cpp:21
+#: xrc.cpp:36
+#: xrc.cpp:241
 msgid "Equirectangular"
 msgstr "Equirectangular"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:851 hugin1/hugin/NumTransDialog.cpp:77
+#: hugin1/hugin/GLPreviewFrame.cpp:851
+#: hugin1/hugin/NumTransDialog.cpp:77
 #: hugin1/hugin/PreviewFrame.cpp:723
 msgid "Yaw value must be numeric."
 msgstr "Hodnota yaw musí být číselná."
 
-#: hugin1/hugin/GLPreviewFrame.cpp:859 hugin1/hugin/NumTransDialog.cpp:83
+#: hugin1/hugin/GLPreviewFrame.cpp:859
+#: hugin1/hugin/NumTransDialog.cpp:83
 #: hugin1/hugin/PreviewFrame.cpp:729
 msgid "Pitch value must be numeric."
 msgstr "Hodnota pitch musí být číselná."
 
-#: hugin1/hugin/GLPreviewFrame.cpp:867 hugin1/hugin/NumTransDialog.cpp:89
+#: hugin1/hugin/GLPreviewFrame.cpp:867
+#: hugin1/hugin/NumTransDialog.cpp:89
 #: hugin1/hugin/PreviewFrame.cpp:735
 msgid "Roll value must be numeric."
 msgstr "Hodnota roll musí být číselná."
 
-#: hugin1/hugin/GLPreviewFrame.cpp:884 hugin1/hugin/GLPreviewFrame.cpp:906
-#: hugin1/hugin/GLPreviewFrame.cpp:1509 hugin1/hugin/GLPreviewFrame.cpp:1540
-#: hugin1/hugin/huginApp.cpp:68 hugin1/hugin/ImagesPanel.cpp:408
-#: hugin1/hugin/PanoPanel.cpp:575 hugin1/hugin/PanoPanel.cpp:606
-#: hugin1/hugin/PreviewFrame.cpp:758 hugin1/hugin/PreviewFrame.cpp:773
+#: hugin1/hugin/GLPreviewFrame.cpp:884
+#: hugin1/hugin/GLPreviewFrame.cpp:906
+#: hugin1/hugin/GLPreviewFrame.cpp:1515
+#: hugin1/hugin/GLPreviewFrame.cpp:1546
+#: hugin1/hugin/huginApp.cpp:69
+#: hugin1/hugin/ImagesPanel.cpp:408
+#: hugin1/hugin/PanoPanel.cpp:575
+#: hugin1/hugin/PanoPanel.cpp:606
+#: hugin1/hugin/PreviewFrame.cpp:758
+#: hugin1/hugin/PreviewFrame.cpp:773
 msgid "Value must be numeric."
 msgstr "Hodnota musí být číselná."
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1320 hugin1/hugin/PreviewFrame.cpp:228
+#: hugin1/hugin/GLPreviewFrame.cpp:1323
+#: hugin1/hugin/PreviewFrame.cpp:228
 msgid "difference"
 msgstr "rozdíl"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1341 hugin1/hugin/PanoPanel.cpp:921
+#: hugin1/hugin/GLPreviewFrame.cpp:1344
+#: hugin1/hugin/PanoPanel.cpp:929
 msgid "Calculating optimal crop"
 msgstr "Vypočítat optimální ořez"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PanoPanel.cpp:685
+#: hugin1/hugin/GLPreviewFrame.cpp:1467
+#: hugin1/hugin/PanoPanel.cpp:685
 msgid "Top needs to be an integer bigger than 0"
 msgstr "Vrchní okraj musí  být číslo větší než 0"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1465 hugin1/hugin/PanoPanel.cpp:689
+#: hugin1/hugin/GLPreviewFrame.cpp:1471
+#: hugin1/hugin/PanoPanel.cpp:689
 msgid "left needs to be an integer bigger than 0"
 msgstr "Levý okraj musí být číslo větší než 0"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1469 hugin1/hugin/PanoPanel.cpp:693
+#: hugin1/hugin/GLPreviewFrame.cpp:1475
+#: hugin1/hugin/PanoPanel.cpp:693
 msgid "right needs to be an integer bigger than 0"
 msgstr "Pravý okraj musí být číslo větší než 0"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1473 hugin1/hugin/PanoPanel.cpp:697
+#: hugin1/hugin/GLPreviewFrame.cpp:1479
+#: hugin1/hugin/PanoPanel.cpp:697
 msgid "bottom needs to be an integer bigger than 0"
 msgstr "Spodní okraj musí být číslo větší než 0"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1478 hugin1/hugin/PanoPanel.cpp:702
+#: hugin1/hugin/GLPreviewFrame.cpp:1484
+#: hugin1/hugin/PanoPanel.cpp:702
 msgid "left boundary must be smaller than right"
 msgstr "levý okraj musí být menší než pravý"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1484 hugin1/hugin/PanoPanel.cpp:708
+#: hugin1/hugin/GLPreviewFrame.cpp:1490
+#: hugin1/hugin/PanoPanel.cpp:708
 msgid "top boundary must be smaller than bottom"
 msgstr "horní okraj musí být větší než spodní"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1515 hugin1/hugin/PanoPanel.cpp:581
+#: hugin1/hugin/GLPreviewFrame.cpp:1521
+#: hugin1/hugin/PanoPanel.cpp:581
 #, c-format
 msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf."
 msgstr "Neplatné HFOV. Maximální HFOV pro vybranou projekci je %lf."
 
-#: hugin1/hugin/GLPreviewFrame.cpp:1546 hugin1/hugin/PanoPanel.cpp:612
+#: hugin1/hugin/GLPreviewFrame.cpp:1552
+#: hugin1/hugin/PanoPanel.cpp:612
 #, c-format
 msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf."
 msgstr "Neplatné VFOV. Maximální VFOV pro vybranou projekci je %lf."
@@ -970,14 +1028,12 @@
 "No or only partial information about field of view was found in image file\n"
 "%s\n"
 "\n"
-"Please enter the horizontal field of view (HFOV) or the focal length and "
-"crop factor."
+"Please enter the horizontal field of view (HFOV) or the focal length and crop factor."
 msgstr ""
 "V obrázku nebyly nalezeny žádné nebo jen částečné informace o zorném poli\n"
 "%s\n"
 "\n"
-"Prosím zadejte horizontální zorné pole (HFOV) či ohniskovou vzdálenost a "
-"faktor ořezu."
+"Prosím zadejte horizontální zorné pole (HFOV) či ohniskovou vzdálenost a faktor ořezu."
 
 #: hugin1/hugin/HFOVDialog.cpp:157
 msgid "The horizontal field of view must be positive."
@@ -991,16 +1047,19 @@
 msgid "The crop factor must be positive."
 msgstr "Hodnota ořezu musí být kladná."
 
-#: hugin1/hugin/huginApp.cpp:146 hugin1/ptbatcher/PTBatcherGUI.cpp:71
+#: hugin1/hugin/huginApp.cpp:147
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:71
 msgid "xrc directory not found in bundle"
 msgstr "Adresář xrc nebyl v balíčku nalezen."
 
-#: hugin1/hugin/huginApp.cpp:158 hugin1/ptbatcher/PTBatcherGUI.cpp:77
+#: hugin1/hugin/huginApp.cpp:159
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:77
 #: hugin1/stitch_project/hugin_stitch_project.cpp:277
 msgid "Translations not found in bundle"
 msgstr "Překlad nebyl nalezen."
 
-#: hugin1/hugin/huginApp.cpp:171 hugin1/ptbatcher/PTBatcherGUI.cpp:101
+#: hugin1/hugin/huginApp.cpp:172
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:101
 msgid ""
 "xrc directory not found, hugin needs to be properly installed\n"
 "Tried Path:"
@@ -1008,7 +1067,8 @@
 "Adresář s xrc nebyl nalezen, hugin musí být patřičně nainstalován\n"
 "Vyzkoušený adresář:"
 
-#: hugin1/hugin/ImagesList.cpp:353 hugin1/hugin/ImagesList.cpp:481
+#: hugin1/hugin/ImagesList.cpp:353
+#: hugin1/hugin/ImagesList.cpp:481
 msgid "Filename"
 msgstr "název souboru"
 
@@ -1034,15 +1094,15 @@
 
 #: hugin1/hugin/ImagesList.cpp:359
 msgid "X (TrX)"
-msgstr ""
+msgstr "X (TrX)"
 
 #: hugin1/hugin/ImagesList.cpp:360
 msgid "Y (TrY)"
-msgstr ""
+msgstr "Y (TrY)"
 
 #: hugin1/hugin/ImagesList.cpp:361
 msgid "Z (TrZ)"
-msgstr ""
+msgstr "Z (TrZ)"
 
 #: hugin1/hugin/ImagesList.cpp:362
 msgid "Anchor"
@@ -1054,7 +1114,7 @@
 
 #: hugin1/hugin/ImagesList.cpp:364
 msgid "Stack Number"
-msgstr ""
+msgstr "Číslo štosu"
 
 #: hugin1/hugin/ImagesList.cpp:482
 msgid "Lens no."
@@ -1072,36 +1132,60 @@
 msgid "hfov (v)"
 msgstr "hfov (v)"
 
-#: hugin1/hugin/ImagesList.cpp:520 translations/xrc.cpp:17
-#: translations/xrc.cpp:35 translations/xrc.cpp:252 xrc.cpp:17 xrc.cpp:35
-#: xrc.cpp:252
+#: hugin1/hugin/ImagesList.cpp:520
+#: translations/xrc.cpp:17
+#: translations/xrc.cpp:32
+#: translations/xrc.cpp:237
+#: xrc.cpp:17
+#: xrc.cpp:32
+#: xrc.cpp:237
 msgid "Normal (rectilinear)"
 msgstr "Obyčejný (rectilineární)"
 
-#: hugin1/hugin/ImagesList.cpp:521 translations/xrc.cpp:18
-#: translations/xrc.cpp:36 translations/xrc.cpp:253 xrc.cpp:18 xrc.cpp:36
-#: xrc.cpp:253
+#: hugin1/hugin/ImagesList.cpp:521
+#: translations/xrc.cpp:18
+#: translations/xrc.cpp:33
+#: translations/xrc.cpp:238
+#: xrc.cpp:18
+#: xrc.cpp:33
+#: xrc.cpp:238
 msgid "Panoramic (cylindrical)"
 msgstr "Panoramatický (cylindrický)"
 
-#: hugin1/hugin/ImagesList.cpp:522 translations/xrc.cpp:19
-#: translations/xrc.cpp:37 translations/xrc.cpp:254 xrc.cpp:19 xrc.cpp:37
-#: xrc.cpp:254
+#: hugin1/hugin/ImagesList.cpp:522
+#: translations/xrc.cpp:19
+#: translations/xrc.cpp:34
+#: translations/xrc.cpp:239
+#: xrc.cpp:19
+#: xrc.cpp:34
+#: xrc.cpp:239
 msgid "Circular fisheye"
 msgstr "Kruhové rybí oko"
 
-#: hugin1/hugin/ImagesList.cpp:523 translations/xrc.cpp:20
-#: translations/xrc.cpp:38 translations/xrc.cpp:255 xrc.cpp:20 xrc.cpp:38
-#: xrc.cpp:255
+#: hugin1/hugin/ImagesList.cpp:523
+#: translations/xrc.cpp:20
+#: translations/xrc.cpp:35
+#: translations/xrc.cpp:240
+#: xrc.cpp:20
+#: xrc.cpp:35
+#: xrc.cpp:240
 msgid "Full frame fisheye"
 msgstr "Plnosnímkové rybí oko"
 
-#: hugin1/hugin/ImagesList.cpp:599 translations/xrc.cpp:304
-#: translations/xrc.cpp:490 translations/xrc.cpp:768 xrc.cpp:304 xrc.cpp:490
-#: xrc.cpp:768
+#: hugin1/hugin/ImagesList.cpp:599
+#: translations/xrc.cpp:284
+#: translations/xrc.cpp:501
+#: translations/xrc.cpp:763
+#: xrc.cpp:284
+#: xrc.cpp:501
+#: xrc.cpp:763
 msgid "Crop"
 msgstr "Výřez"
 
+#: hugin1/hugin/ImagesList.cpp:683
+msgid "Number of masks"
+msgstr "Počet masek"
+
 #: hugin1/hugin/ImagesPanel.cpp:329
 #, c-format
 msgid "Added %d control points"
@@ -1141,53 +1225,50 @@
 msgstr "Smazat kontrolní body"
 
 #: hugin1/hugin/ImagesPanel.cpp:938
-msgid ""
-"Your project must have at least two stacks before you can assign images to a "
-"different stack."
-msgstr ""
+msgid "Your project must have at least two stacks before you can assign images to a different stack."
+msgstr "Projekt musí mít nejméně dva štosy než budete moci přiřazovat obrázky do odlišného štosu."
 
 #: hugin1/hugin/ImagesPanel.cpp:942
-#, fuzzy
 msgid "Enter new stack number"
-msgstr "Vložte nové číslo objektivu"
+msgstr "Zadejte nové číslo štosu"
 
 #: hugin1/hugin/ImagesPanel.cpp:943
-#, fuzzy
 msgid "stack number"
-msgstr "Číslo objektivu"
+msgstr "číslo štosu"
 
 #: hugin1/hugin/ImagesPanel.cpp:944
-#, fuzzy
 msgid "Change stack number"
-msgstr "Změnit číslo objektivu"
+msgstr "Změnit číslo štosu"
 
 #: hugin1/hugin/ImagesPanel.cpp:1088
 msgid "classifying control points..."
 msgstr "zařazuji kontrolní body..."
 
-#: hugin1/hugin/LensPanel.cpp:781 hugin1/hugin/LensPanel.cpp:873
-#: hugin1/hugin/LensPanel.cpp:918 hugin1/hugin/LensPanel.cpp:1043
-#: hugin1/hugin/LensPanel.cpp:1070
+#: hugin1/hugin/LensPanel.cpp:779
+#: hugin1/hugin/LensPanel.cpp:871
+#: hugin1/hugin/LensPanel.cpp:916
+#: hugin1/hugin/LensPanel.cpp:1041
+#: hugin1/hugin/LensPanel.cpp:1068
 msgid "Please select an image and try again"
 msgstr "Vyberte, prosím, obrázek a zkuste znovu"
 
-#: hugin1/hugin/LensPanel.cpp:798
+#: hugin1/hugin/LensPanel.cpp:796
 msgid "Save lens parameters file"
 msgstr "Uložit soubor s parametry objektivu"
 
-#: hugin1/hugin/LensPanel.cpp:800
+#: hugin1/hugin/LensPanel.cpp:798
 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
 msgstr "Soubory s vlastnostmi objektivu (*.ini)|*.ini|All files (*)|*"
 
-#: hugin1/hugin/LensPanel.cpp:927
+#: hugin1/hugin/LensPanel.cpp:925
 msgid "Load lens parameters"
 msgstr "Nahrát parametry objektivu"
 
-#: hugin1/hugin/LensPanel.cpp:929
+#: hugin1/hugin/LensPanel.cpp:927
 msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
 msgstr "Soubory s vlastnostmi objektivu (*.ini)|*.ini|All files (*.*)|*.*"
 
-#: hugin1/hugin/LensPanel.cpp:949
+#: hugin1/hugin/LensPanel.cpp:947
 msgid ""
 "Incompatible lens parameter file, image sizes do not match\n"
 "Apply settings anyway?"
@@ -1195,25 +1276,23 @@
 "Nekompatibilní soubor s parametry objektivu, velikosti obrázků nesedí\n"
 "Chcete nastavení přesto použít?"
 
-#: hugin1/hugin/LensPanel.cpp:949
+#: hugin1/hugin/LensPanel.cpp:947
 msgid "Error loading lens parameters"
 msgstr "Chyba při nahrávání parametrů objektivu."
 
-#: hugin1/hugin/LensPanel.cpp:1052
-msgid ""
-"Your project must have at least two lenses before you can change which lens "
-"these images use."
-msgstr ""
+#: hugin1/hugin/LensPanel.cpp:1050
+msgid "Your project must have at least two lenses before you can change which lens these images use."
+msgstr "Projekt musí mít nejméně dva objektivy než budete moci přiřazovat obrázkům odlišný objektiv."
 
-#: hugin1/hugin/LensPanel.cpp:1057
+#: hugin1/hugin/LensPanel.cpp:1055
 msgid "Enter new lens number"
 msgstr "Vložte nové číslo objektivu"
 
-#: hugin1/hugin/LensPanel.cpp:1058
+#: hugin1/hugin/LensPanel.cpp:1056
 msgid "Lens number"
 msgstr "Číslo objektivu"
 
-#: hugin1/hugin/LensPanel.cpp:1059
+#: hugin1/hugin/LensPanel.cpp:1057
 msgid "Change lens number"
 msgstr "Změnit číslo objektivu"
 
@@ -1241,12 +1320,12 @@
 msgid "Did you know..."
 msgstr "Víte, že ..."
 
-#: hugin1/hugin/MainFrame.cpp:215
+#: hugin1/hugin/MainFrame.cpp:217
 #, c-format
 msgid "Version %s"
 msgstr "Verze %s"
 
-#: hugin1/hugin/MainFrame.cpp:235
+#: hugin1/hugin/MainFrame.cpp:237
 msgid ""
 "Fatal installation error\n"
 "The file data/splash.png was not found at:"
@@ -1254,17 +1333,24 @@
 "Kritická chyba při instalaci\n"
 "Soubor data/splash.png nebyl nalezen v:"
 
-#: hugin1/hugin/MainFrame.cpp:255 hugin1/ptbatcher/BatchFrame.cpp:117
-#: translations/xrc.cpp:77 translations/xrc.cpp:312 translations/xrc.cpp:359
-#: translations/xrc.cpp:360 xrc.cpp:77 xrc.cpp:312 xrc.cpp:359 xrc.cpp:360
+#: hugin1/hugin/MainFrame.cpp:257
+#: hugin1/ptbatcher/BatchFrame.cpp:117
+#: translations/xrc.cpp:72
+#: translations/xrc.cpp:293
+#: translations/xrc.cpp:342
+#: translations/xrc.cpp:343
+#: xrc.cpp:72
+#: xrc.cpp:293
+#: xrc.cpp:342
+#: xrc.cpp:343
 msgid "&Help"
 msgstr "&Nápověda"
 
-#: hugin1/hugin/MainFrame.cpp:336
+#: hugin1/hugin/MainFrame.cpp:343
 msgid "Started"
 msgstr "Spuštěn"
 
-#: hugin1/hugin/MainFrame.cpp:475
+#: hugin1/hugin/MainFrame.cpp:482
 msgid ""
 "The panorama has been changed\n"
 "Save changes?"
@@ -1272,116 +1358,120 @@
 "Panorama bylo změněno\n"
 "Uložit změny?"
 
-#: hugin1/hugin/MainFrame.cpp:475
+#: hugin1/hugin/MainFrame.cpp:482
 msgid "Save Panorama?"
 msgstr "Uložit Panorama?"
 
-#: hugin1/hugin/MainFrame.cpp:508
+#: hugin1/hugin/MainFrame.cpp:515
 msgid "forced close"
 msgstr "nucené zavření"
 
-#: hugin1/hugin/MainFrame.cpp:571
+#: hugin1/hugin/MainFrame.cpp:578
 #, c-format
 msgid "saved project %s"
 msgstr "projekt %s uložen"
 
-#: hugin1/hugin/MainFrame.cpp:572 hugin1/hugin/MainFrame.cpp:667
-#: hugin1/hugin/MainFrame.cpp:751 translations/xrc.cpp:300 xrc.cpp:300
+#: hugin1/hugin/MainFrame.cpp:579
+#: hugin1/hugin/MainFrame.cpp:674
+#: hugin1/hugin/MainFrame.cpp:758
+#: translations/xrc.cpp:280
+#: xrc.cpp:280
 msgid "Hugin - Panorama Stitcher"
 msgstr "Hugin - slepuje panorama"
 
-#: hugin1/hugin/MainFrame.cpp:589
+#: hugin1/hugin/MainFrame.cpp:596
 msgid "Save project file"
 msgstr "Uložit projekt"
 
-#: hugin1/hugin/MainFrame.cpp:591
+#: hugin1/hugin/MainFrame.cpp:598
 msgid "Project files (*.pto)|*.pto|All files (*)|*"
 msgstr "Soubory projektu (*.pto)|*.pto|All files (*)|*"
 
-#: hugin1/hugin/MainFrame.cpp:601
+#: hugin1/hugin/MainFrame.cpp:608
+#: hugin1/hugin/MaskEditorPanel.cpp:332
 #, c-format
 msgid "File %s exists. Overwrite?"
 msgstr "Soubor %s existuje. Mám ho přepsat?"
 
-#: hugin1/hugin/MainFrame.cpp:602 translations/xrc.cpp:378 xrc.cpp:378
+#: hugin1/hugin/MainFrame.cpp:609
+#: translations/xrc.cpp:361
+#: xrc.cpp:361
 msgid "Save project"
 msgstr "Uložit projekt"
 
-#: hugin1/hugin/MainFrame.cpp:623
+#: hugin1/hugin/MainFrame.cpp:630
 msgid "Save PTmender script file"
 msgstr "Uložit PTmender skriptový soubor"
 
-#: hugin1/hugin/MainFrame.cpp:625
+#: hugin1/hugin/MainFrame.cpp:632
 msgid "PTmender files (*.txt)|*.txt"
 msgstr "PTmender soubory (*.txt)|*.txt"
 
-#: hugin1/hugin/MainFrame.cpp:652
+#: hugin1/hugin/MainFrame.cpp:659
 msgid "Open project:   "
 msgstr "Otevřít projekt:   "
 
-#: hugin1/hugin/MainFrame.cpp:665
+#: hugin1/hugin/MainFrame.cpp:672
 msgid "Project opened"
 msgstr "Projekt otevřen"
 
-#: hugin1/hugin/MainFrame.cpp:678
+#: hugin1/hugin/MainFrame.cpp:685
 msgid "Error opening project:   "
 msgstr "Chyba při otevírání projektu:   "
 
-#: hugin1/hugin/MainFrame.cpp:724 hugin1/hugin/MainFrame.cpp:1259
+#: hugin1/hugin/MainFrame.cpp:731
+#: hugin1/hugin/MainFrame.cpp:1266
 msgid "Open project file"
 msgstr "Otevřít projekt"
 
-#: hugin1/hugin/MainFrame.cpp:726 hugin1/hugin/MainFrame.cpp:1261
-#: hugin1/hugin/MainFrame.cpp:1298 hugin1/ptbatcher/Batch.cpp:576
+#: hugin1/hugin/MainFrame.cpp:733
+#: hugin1/hugin/MainFrame.cpp:1268
+#: hugin1/hugin/MainFrame.cpp:1305
+#: hugin1/ptbatcher/Batch.cpp:576
 #: hugin1/ptbatcher/BatchFrame.cpp:354
 #: hugin1/stitch_project/hugin_stitch_project.cpp:343
-msgid ""
-"Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
-"(*)|*"
-msgstr ""
-"Soubory projektu (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All "
-"files (*)|*"
+msgid "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"
+msgstr "Soubory projektu (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"
 
-#: hugin1/hugin/MainFrame.cpp:740
+#: hugin1/hugin/MainFrame.cpp:747
 msgid "Open project: cancel"
 msgstr "Otevírání projektu: zrušit"
 
-#: hugin1/hugin/MainFrame.cpp:782 hugin1/hugin/wxPanoCommand.cpp:385
-#: hugin1/hugin/wxPanoCommand.cpp:494
+#: hugin1/hugin/MainFrame.cpp:789
+#: hugin1/hugin/wxPanoCommand.cpp:399
+#: hugin1/hugin/wxPanoCommand.cpp:510
 msgid "Add images"
 msgstr "Přidat obrázky"
 
-#: hugin1/hugin/MainFrame.cpp:848
+#: hugin1/hugin/MainFrame.cpp:855
 msgid "Add Image: cancel"
 msgstr "Přidat obrázek: zrušit"
 
-#: hugin1/hugin/MainFrame.cpp:1146
+#: hugin1/hugin/MainFrame.cpp:1153
 msgid "Can't start system's web browser"
 msgstr "Nemohu spustit systémový internetový prohlížeč"
 
-#: hugin1/hugin/MainFrame.cpp:1296
+#: hugin1/hugin/MainFrame.cpp:1303
 msgid "Choose template project"
 msgstr "Vyberte šablonu"
 
-#: hugin1/hugin/MainFrame.cpp:1363
+#: hugin1/hugin/MainFrame.cpp:1370
 msgid "Fine-tuning all points"
 msgstr "Dolaďování všech bodů"
 
-#: hugin1/hugin/MainFrame.cpp:1363
+#: hugin1/hugin/MainFrame.cpp:1370
 msgid "Finetuning"
 msgstr "Dolaďování"
 
-#: hugin1/hugin/MainFrame.cpp:1455
+#: hugin1/hugin/MainFrame.cpp:1462
 #, c-format
 msgid ""
 "%d points fine-tuned, %d points not updated due to low correlation\n"
 "\n"
-"Hint: The errors of the fine-tuned points have been set to the correlation "
-"coefficient\n"
+"Hint: The errors of the fine-tuned points have been set to the correlation coefficient\n"
 "Problematic points can be spotted (just after fine-tune, before optimizing)\n"
 "by an error <= %.3f.\n"
-"The error of points without a well defined peak (typically in regions with "
-"uniform color)\n"
+"The error of points without a well defined peak (typically in regions with uniform color)\n"
 "will be set to 0\n"
 "\n"
 "Use the Control Point list (F3) to see all points of the current project\n"
@@ -1391,18 +1481,20 @@
 "Tip: Chyby doladěných bodů byly uloženy do korelačního koeficientu\n"
 "Problematický bod může být zjištěn (hned po doladění, před optimalizací)\n"
 "tak, že jeho chyba <= %.3f.\n"
-"Chyba bodů bez dobře definovaného vrcholu (typicky v oblastech s jednolitou "
-"barvou)\n"
+"Chyba bodů bez dobře definovaného vrcholu (typicky v oblastech s jednolitou barvou)\n"
 "bude nastavena na 0\n"
 "\n"
-"Použijte Seznam kontrolních bodů (F3), abyste zobrazili všechny body "
-"aktuálního projektu\n"
+"Použijte Seznam kontrolních bodů (F3), abyste zobrazili všechny body aktuálního projektu\n"
 
-#: hugin1/hugin/MainFrame.cpp:1457
+#: hugin1/hugin/MainFrame.cpp:1464
 msgid "Fine-tune result"
 msgstr "Doladěný výsledek"
 
-#: hugin1/hugin/MainFrame.cpp:1691
+#: hugin1/hugin/MainFrame.cpp:1524
+msgid "Removing control points in masks"
+msgstr "Odebere kontrolní body v maskách"
+
+#: hugin1/hugin/MainFrame.cpp:1754
 #, c-format
 msgid ""
 "File \"%s\" not found.\n"
@@ -1411,12 +1503,57 @@
 "Soubor \"%s\" nebyl nalezen.\n"
 "Možná byl přejmenován, přesunut či smazán."
 
-#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:334
-#: hugin1/ptbatcher/Batch.cpp:687 hugin1/ptbatcher/Batch.cpp:704
+#: hugin1/hugin/MainFrame.cpp:1755
+#: hugin1/ptbatcher/Batch.cpp:334
+#: hugin1/ptbatcher/Batch.cpp:687
+#: hugin1/ptbatcher/Batch.cpp:704
 #: hugin1/ptbatcher/Batch.cpp:895
 msgid "Error!"
 msgstr "Chyba!"
 
+#: hugin1/hugin/MaskEditorPanel.cpp:101
+msgid "Mask type"
+msgstr "Typ masky"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:310
+msgid "Create a polygon mask by clicking with left mouse button on image, set last point with right mouse button."
+msgstr "Vytvořte mnohaúhelníkovou masku klikáním levým tlačítkem myši, poslední bod klikněte pravým tlačítkem myši."
+
+#: hugin1/hugin/MaskEditorPanel.cpp:319
+#: translations/xrc.cpp:395
+#: xrc.cpp:395
+msgid "Save mask"
+msgstr "Uloží masku"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:321
+#: hugin1/hugin/MaskEditorPanel.cpp:355
+msgid "Mask files (*.msk)|*.msk|All files (*)|*"
+msgstr "Masky (*.msk)|*.msk|Všechny soubory (*)|*"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:333
+msgid "Save Mask"
+msgstr "Uložit masku"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:353
+msgid "Load mask"
+msgstr "Nahrávát masku"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:358
+msgid "Load mask: cancel"
+msgstr "Nahrávání masky: zrušit"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:528
+#: translations/xrc.cpp:397
+#: xrc.cpp:397
+msgid "Exclude region"
+msgstr "Vytěsnit oblast"
+
+#: hugin1/hugin/MaskEditorPanel.cpp:531
+#: translations/xrc.cpp:398
+#: xrc.cpp:398
+msgid "Include region"
+msgstr "Zahrnut oblast"
+
 #: hugin1/hugin/NonaOptionsDialog.cpp:55
 msgid "Nona options"
 msgstr "Nona možnosti"
@@ -1428,8 +1565,7 @@
 "\n"
 "The results are probably invalid.\n"
 "\n"
-"Optimization of the Field of View (v) of partial panoramas can lead to bad "
-"results.\n"
+"Optimization of the Field of View (v) of partial panoramas can lead to bad results.\n"
 "Try adding more images and control points.\n"
 "\n"
 "Apply the changes anyway?"
@@ -1439,8 +1575,7 @@
 "\n"
 "Výsledky jsou pravděpodobně chybné.\n"
 "\n"
-"Optimalizace zorného pole(v) u panoramat nepokrývajících 360 stupňů může "
-"vést k chybným výsledkům.\n"
+"Optimalizace zorného pole(v) u panoramat nepokrývajících 360 stupňů může vést k chybným výsledkům.\n"
 "Zkuste přidat více kontrolních bodů.\n"
 "\n"
 "Chcete opravdu změny použít?"
@@ -1456,8 +1591,7 @@
 "\n"
 "*WARNING*: very high distortion coefficients (a,b,c) have been estimated.\n"
 "The results are probably invalid.\n"
-"Only optimize all distortion parameters when many, well spread control "
-"points are used.\n"
+"Only optimize all distortion parameters when many, well spread control points are used.\n"
 "Please reset the a,b and c parameters to zero and add more control points\n"
 "\n"
 "Apply the changes anyway?"
@@ -1470,8 +1604,7 @@
 "\n"
 "*VAROVÁNÍ*: odhadnuty velmi velké koeficienty zkreslení (a,b,c).\n"
 "Výsledky jsou pravděpodobně chybné.\n"
-"Optimalizujte všechny parametry zkreslení jenom pokud jste umístili mnoho "
-"dobře rozprostřených bodů.\n"
+"Optimalizujte všechny parametry zkreslení jenom pokud jste umístili mnoho dobře rozprostřených bodů.\n"
 "Vynulujte parametry a,b,c a přidejte více kontrolních bodů.\n"
 "\n"
 "\n"
@@ -1518,12 +1651,10 @@
 
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:483
 msgid ""
-"The vignetting and exposure correction is determined by analysing color "
-"values in the overlapping areas.\n"
+"The vignetting and exposure correction is determined by analysing color values in the overlapping areas.\n"
 "To speed up the computation, only a random subset of points is used."
 msgstr ""
-"Korekce charakteristiky a expozice jsou určeny analýzou barev v "
-"překrývajících se oblastech. \n"
+"Korekce charakteristiky a expozice jsou určeny analýzou barev v překrývajících se oblastech. \n"
 "Pro urychlení výpočtu jsou použity jen některé náhodně vybrané body."
 
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:484
@@ -1540,9 +1671,7 @@
 
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:523
 msgid "Error: no overlapping points found, Photometric optimization aborted"
-msgstr ""
-"Chyba: Nebyly nalezeny žádné překrývající se body, fotometrická "
-"optimalizace  zrušena"
+msgstr "Chyba: Nebyly nalezeny žádné překrývající se body, fotometrická optimalizace  zrušena"
 
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:556
 msgid "Internal error during photometric optimization:\n"
@@ -1556,14 +1685,12 @@
 #, c-format
 msgid ""
 "Photometric optimization results:\n"
-"Average difference (RMSE) between overlapping pixels: %.2f gray values "
-"(0..255)\n"
+"Average difference (RMSE) between overlapping pixels: %.2f gray values (0..255)\n"
 "\n"
 "Apply results?"
 msgstr ""
 "Výsledky fotometrické optimalizace:\n"
-"Průměrný rozdíl mezi překrývajícími se body: %.2f  v hodnotách šedé "
-"(0..255)\n"
+"Průměrný rozdíl mezi překrývajícími se body: %.2f  v hodnotách šedé (0..255)\n"
 "\n"
 "Použít výsledky?"
 
@@ -1575,11 +1702,13 @@
 msgid "The druid has no advice."
 msgstr "Pomocník nemá žádný nápad."
 
-#: hugin1/hugin/PanoDruid.cpp:54 hugin1/hugin/PanoDruid.cpp:424
+#: hugin1/hugin/PanoDruid.cpp:54
+#: hugin1/hugin/PanoDruid.cpp:424
 msgid "The druid finds no problems with your panorama."
 msgstr "Pomocník nenašel žádný problém s vaším panoramatem."
 
-#: hugin1/hugin/PanoDruid.cpp:55 hugin1/hugin/PanoDruid.cpp:425
+#: hugin1/hugin/PanoDruid.cpp:55
+#: hugin1/hugin/PanoDruid.cpp:425
 msgid ""
 "Stitch your final image now, and then use an image editor\n"
 "such as the GNU Image Manipulation Program (the GIMP)\n"
@@ -1589,11 +1718,13 @@
 "jako je např. GNU Image Manipulation Program (GIMP)\n"
 "k vylepšení do dokonalosti."
 
-#: hugin1/hugin/PanoDruid.cpp:64 hugin1/hugin/PanoDruid.cpp:444
+#: hugin1/hugin/PanoDruid.cpp:64
+#: hugin1/hugin/PanoDruid.cpp:444
 msgid "Warning:  you haven't saved the current project."
 msgstr "Varování: nebyl uložen stávající projekt."
 
-#: hugin1/hugin/PanoDruid.cpp:65 hugin1/hugin/PanoDruid.cpp:445
+#: hugin1/hugin/PanoDruid.cpp:65
+#: hugin1/hugin/PanoDruid.cpp:445
 msgid ""
 "While everything else seems to be ready to stitch,\n"
 "don't forget to save your project file so you can\n"
@@ -1603,7 +1734,8 @@
 "nezapomeňte ale uložit projekt, abyste později mohli\n"
 "experimentovat nebo vylepšovat nastavení."
 
-#: hugin1/hugin/PanoDruid.cpp:74 hugin1/hugin/PanoDruid.cpp:440
+#: hugin1/hugin/PanoDruid.cpp:74
+#: hugin1/hugin/PanoDruid.cpp:440
 msgid "Warning:  current stitch has huge dimensions."
 msgstr "Varování: aktuální slepování má obrovské rozměry."
 
@@ -1623,11 +1755,13 @@
 "použijte tlačítko Vypočítat optimální velikost\n"
 "na panelu Nastavení Panoramatu."
 
-#: hugin1/hugin/PanoDruid.cpp:105 hugin1/hugin/PanoDruid.cpp:436
+#: hugin1/hugin/PanoDruid.cpp:105
+#: hugin1/hugin/PanoDruid.cpp:436
 msgid "The Horizontal Field of View (HFOV) may be too low."
 msgstr "Horizontální zorné pole (HFOV) může být příliš malé."
 
-#: hugin1/hugin/PanoDruid.cpp:106 hugin1/hugin/PanoDruid.cpp:437
+#: hugin1/hugin/PanoDruid.cpp:106
+#: hugin1/hugin/PanoDruid.cpp:437
 msgid ""
 "Check that the focal lengths and/or hfov figures\n"
 "for each image are correct for the camera settings.\n"
@@ -1721,19 +1855,23 @@
 "bodů na místa, které si odpovídají vizuálně na 2 překrývajících\n"
 "se obrázcích."
 
-#: hugin1/hugin/PanoDruid.cpp:214 hugin1/hugin/PanoDruid.cpp:432
+#: hugin1/hugin/PanoDruid.cpp:214
+#: hugin1/hugin/PanoDruid.cpp:432
 msgid "Add at least one more image."
 msgstr "Přidejte ještě alespoň jeden obrázek."
 
-#: hugin1/hugin/PanoDruid.cpp:215 hugin1/hugin/PanoDruid.cpp:433
+#: hugin1/hugin/PanoDruid.cpp:215
+#: hugin1/hugin/PanoDruid.cpp:433
 msgid "You should have at least two files listed in the Images tab."
 msgstr "Měli byste mít alespoň 2 obrázky na seznamu na panelu Obrázky."
 
-#: hugin1/hugin/PanoDruid.cpp:229 hugin1/hugin/PanoDruid.cpp:428
+#: hugin1/hugin/PanoDruid.cpp:229
+#: hugin1/hugin/PanoDruid.cpp:428
 msgid "To get started, add some image files."
 msgstr "Pro začátek vložte několik obrázků."
 
-#: hugin1/hugin/PanoDruid.cpp:230 hugin1/hugin/PanoDruid.cpp:429
+#: hugin1/hugin/PanoDruid.cpp:230
+#: hugin1/hugin/PanoDruid.cpp:429
 msgid "You can add any number of images using the Images tab."
 msgstr "Můžete vložit neomezené množství obrázků na panelu Obrázky."
 
@@ -1826,9 +1964,8 @@
 msgstr "Trojploché"
 
 #: hugin1/hugin/PanoPanel.cpp:162
-#, fuzzy
 msgid "Panini General"
-msgstr "Obecné"
+msgstr "Panini obecné"
 
 #: hugin1/hugin/PanoPanel.cpp:658
 msgid "width needs to be an integer bigger than 0"
@@ -1842,23 +1979,23 @@
 msgid " PTmender options not yet implemented"
 msgstr "ZNastavení pro PTMender zatím nejsou dostupná"
 
-#: hugin1/hugin/PanoPanel.cpp:823
+#: hugin1/hugin/PanoPanel.cpp:827
 msgid " PTblender options not yet implemented"
 msgstr "Nastavení pro PTBlender zatím nejsou dostupná"
 
-#: hugin1/hugin/PanoPanel.cpp:873
+#: hugin1/hugin/PanoPanel.cpp:881
 msgid " Options for this HDRMerge program not yet implemented"
 msgstr "Nastavení pro tento  HDRMerge program ještě nebyly napsány"
 
-#: hugin1/hugin/PanoPanel.cpp:962
+#: hugin1/hugin/PanoPanel.cpp:970
 msgid "Could not create temporary project file"
 msgstr "Nelze vytvořit dočasný projektový soubor"
 
-#: hugin1/hugin/PanoPanel.cpp:1060
+#: hugin1/hugin/PanoPanel.cpp:1068
 msgid "Could not execute command: "
 msgstr "Nelze spustit příkaz:  "
 
-#: hugin1/hugin/PanoPanel.cpp:1060
+#: hugin1/hugin/PanoPanel.cpp:1068
 msgid "ShellExecuteEx failed"
 msgstr "ShellExecuteEx selhalo"
 
@@ -1952,7 +2089,7 @@
 
 #: hugin1/hugin/PreferencesDialog.cpp:177
 msgid "Finnish"
-msgstr ""
+msgstr "Finština"
 
 #: hugin1/hugin/PreferencesDialog.cpp:273
 msgid "Select PTmender"
@@ -1985,7 +2122,9 @@
 msgid "Really reset displayed preferences to default values?"
 msgstr "Opravdu nastavit zobrazené nastavení na výchozí hodnoty?"
 
-#: hugin1/hugin/PreferencesDialog.cpp:592 translations/xrc.cpp:690 xrc.cpp:690
+#: hugin1/hugin/PreferencesDialog.cpp:592
+#: translations/xrc.cpp:686
+#: xrc.cpp:686
 msgid "Load Defaults"
 msgstr "Nahrát výchozí"
 
@@ -2018,39 +2157,26 @@
 msgid "Drag the inside of the cropping rectangle to adjust the crop."
 msgstr "Přetahujte v oblasti ořezového obdélníku pro úpravu ořezu."
 
-#: hugin1/hugin/PreviewDragTool.cpp:53 hugin1/hugin/PreviewDragTool.cpp:260
-msgid ""
-"Drag to move images (optionally use shift to constrain), or roll with right-"
-"drag or ctrl-drag."
-msgstr ""
-"Přetáhněte pro přesun obrázků( případně pomocí shiftu pro přesun jen po "
-"jedné ose) , nebo otáčejte pomocí tažení pravým tlačítkem (či tažení s Ctrl)"
+#: hugin1/hugin/PreviewDragTool.cpp:53
+#: hugin1/hugin/PreviewDragTool.cpp:260
+msgid "Drag to move images (optionally use shift to constrain), or roll with right-drag or ctrl-drag."
+msgstr "Přetáhněte pro přesun obrázků( případně pomocí shiftu pro přesun jen po jedné ose) , nebo otáčejte pomocí tažení pravým tlačítkem (či tažení s Ctrl)"
 
 #: hugin1/hugin/PreviewDragTool.cpp:76
-msgid ""
-"Currently constrained to moving only pitch. Make a larger movement in the "
-"opposite direction to constrain to yaw."
-msgstr ""
-"Nyní omezeno pouze na hodnotu pitch. Silně pohněte myší v opačném směru pro "
-"omezení na yaw."
+msgid "Currently constrained to moving only pitch. Make a larger movement in the opposite direction to constrain to yaw."
+msgstr "Nyní omezeno pouze na hodnotu pitch. Silně pohněte myší v opačném směru pro omezení na yaw."
 
 #: hugin1/hugin/PreviewDragTool.cpp:80
-msgid ""
-"Currently constrained to moving only yaw. Make a larger movement in the "
-"opposite direction to constrain to pitch."
-msgstr ""
-"Nyní omezeno pouze na hodnotu yaw. Silně pohněte myší v opačném směru pro "
-"omezení na pitch."
+msgid "Currently constrained to moving only yaw. Make a larger movement in the opposite direction to constrain to pitch."
+msgstr "Nyní omezeno pouze na hodnotu yaw. Silně pohněte myší v opačném směru pro omezení na pitch."
 
 #: hugin1/hugin/PreviewDragTool.cpp:149
 msgid "Rotate around the centre to roll."
 msgstr "Otáčejte kolem středu."
 
 #: hugin1/hugin/PreviewDragTool.cpp:170
-msgid ""
-"Constrained drag: make a movement and it will be snapped to the yaw or pitch."
-msgstr ""
-"Omezené přetažení: pohněte myší a pohyb bude zaokrouhlen jen na jednu osu."
+msgid "Constrained drag: make a movement and it will be snapped to the yaw or pitch."
+msgstr "Omezené přetažení: pohněte myší a pohyb bude zaokrouhlen jen na jednu osu."
 
 #: hugin1/hugin/PreviewDragTool.cpp:172
 msgid "Drag to move."
@@ -2064,11 +2190,15 @@
 msgid "Preview Options"
 msgstr "Nastavení náhledu"
 
-#: hugin1/hugin/PreviewFrame.cpp:197 translations/xrc.cpp:480 xrc.cpp:480
+#: hugin1/hugin/PreviewFrame.cpp:197
+#: translations/xrc.cpp:491
+#: xrc.cpp:491
 msgid "projection (f):"
 msgstr "projekce (f):"
 
-#: hugin1/hugin/PreviewFrame.cpp:222 translations/xrc.cpp:741 xrc.cpp:741
+#: hugin1/hugin/PreviewFrame.cpp:222
+#: translations/xrc.cpp:736
+#: xrc.cpp:736
 msgid "Blend mode:"
 msgstr "Mód prolnutí:"
 
@@ -2084,7 +2214,9 @@
 msgid "HDR"
 msgstr "HDR"
 
-#: hugin1/hugin/PreviewFrame.cpp:262 translations/xrc.cpp:742 xrc.cpp:742
+#: hugin1/hugin/PreviewFrame.cpp:262
+#: translations/xrc.cpp:737
+#: xrc.cpp:737
 msgid "EV:"
 msgstr "EV:"
 
@@ -2092,31 +2224,28 @@
 msgid "Projection Parameters"
 msgstr "Parametry projekce"
 
-#: hugin1/hugin/PreviewFrame.cpp:336 hugin1/hugin/PreviewPanel.cpp:775
-msgid ""
-"Left click to define new center point, right click to move point to horizon."
-msgstr ""
-"Levým kliknutím definujete nový střed, pravým přesunete bod na horizont."
+#: hugin1/hugin/PreviewFrame.cpp:336
+#: hugin1/hugin/PreviewPanel.cpp:775
+msgid "Left click to define new center point, right click to move point to horizon."
+msgstr "Levým kliknutím definujete nový střed, pravým přesunete bod na horizont."
 
-#: hugin1/hugin/PreviewFrame.cpp:371 hugin1/hugin/PreviewFrame.cpp:498
+#: hugin1/hugin/PreviewFrame.cpp:371
+#: hugin1/hugin/PreviewFrame.cpp:498
 msgid "Center panorama with left mouse button, set horizon with right button"
-msgstr ""
-"Vystřeďte panorama levým tlačítkem myši, nastavte horizont pravým tlačítkem."
+msgstr "Vystřeďte panorama levým tlačítkem myši, nastavte horizont pravým tlačítkem."
 
-#: hugin1/hugin/PreviewIdentifyTool.cpp:183
-#: hugin1/hugin/PreviewIdentifyTool.cpp:246
+#: hugin1/hugin/PreviewIdentifyTool.cpp:188
+#: hugin1/hugin/PreviewIdentifyTool.cpp:251
 msgid "Move the mouse over the images or image buttons to identify them."
-msgstr ""
-"Přesuňte myší přes obrázky či tlačítka obrázků pro jejich identifikování."
+msgstr "Přesuňte myší přes obrázky či tlačítka obrázků pro jejich identifikování."
 
-#: hugin1/hugin/PreviewIdentifyTool.cpp:244
+#: hugin1/hugin/PreviewIdentifyTool.cpp:249
 msgid "Click to create or edit control points here."
 msgstr "Zde klikněte pro přidání či úpravu kontrolních bodů."
 
-#: hugin1/hugin/PreviewLayoutLinesTool.cpp:174
-#, fuzzy
+#: hugin1/hugin/PreviewLayoutLinesTool.cpp:176
 msgid "Click a connection to edit control points."
-msgstr "Zde klikněte pro přidání či úpravu kontrolních bodů."
+msgstr "Klikněte  na propojení pro  úpravu kontrolních bodů."
 
 #: hugin1/hugin/PreviewPanel.cpp:495
 msgid "Error during Stitching"
@@ -2137,7 +2266,7 @@
 msgid "Unsupported image file format"
 msgstr "Nepodporovaný obrazový formát"
 
-#: hugin1/hugin/wxPanoCommand.cpp:378
+#: hugin1/hugin/wxPanoCommand.cpp:392
 #, c-format
 msgid ""
 "Image file not found:\n"
@@ -2148,11 +2277,11 @@
 "%s\n"
 "Vyberte, prosím, správný obrázek"
 
-#: hugin1/hugin/wxPanoCommand.cpp:378
+#: hugin1/hugin/wxPanoCommand.cpp:392
 msgid "Image file not found"
 msgstr "Obrázek nenalezen"
 
-#: hugin1/hugin/wxPanoCommand.cpp:470
+#: hugin1/hugin/wxPanoCommand.cpp:486
 #, c-format
 msgid ""
 "%d invalid control point(s) found.\n"
@@ -2163,11 +2292,11 @@
 "\n"
 "Stiskněte OK pro jejich odebrání."
 
-#: hugin1/hugin/wxPanoCommand.cpp:471
+#: hugin1/hugin/wxPanoCommand.cpp:487
 msgid "Error Detected"
 msgstr "Rozpoznána chyba"
 
-#: hugin1/hugin/wxPanoCommand.cpp:568
+#: hugin1/hugin/wxPanoCommand.cpp:584
 #, c-format
 msgid ""
 "Error, template expects %d images,\n"
@@ -2176,20 +2305,23 @@
 "Chyba, šablona očekává %d obrázků,\n"
 "projekt obsahuje %d obrázků\n"
 
-#: hugin1/hugin/wxPanoCommand.cpp:569 hugin1/hugin/wxPanoCommand.cpp:595
+#: hugin1/hugin/wxPanoCommand.cpp:585
+#: hugin1/hugin/wxPanoCommand.cpp:611
 msgid "Could not apply template"
 msgstr "Nelze použít šablonu"
 
-#: hugin1/hugin/wxPanoCommand.cpp:595
+#: hugin1/hugin/wxPanoCommand.cpp:611
 msgid "Error loading project file"
 msgstr "Chyba při otevírání projektu"
 
-#: hugin1/nona_gui/nona_gui.cpp:154 hugin1/ptbatcher/PTBatcherGUI.cpp:142
+#: hugin1/nona_gui/nona_gui.cpp:154
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:142
 #: hugin1/stitch_project/hugin_stitch_project.cpp:312
 msgid "Syntax error in parameters detected, aborting."
 msgstr "Objevena syntaktická chyba v parametrech, končím."
 
-#: hugin1/nona_gui/nona_gui.cpp:169 hugin1/ptbatcher/Batch.cpp:574
+#: hugin1/nona_gui/nona_gui.cpp:169
+#: hugin1/ptbatcher/Batch.cpp:574
 #: hugin1/stitch_project/hugin_stitch_project.cpp:341
 msgid "Specify project source project file"
 msgstr "Určete zdrojový projektový soubor"
@@ -2202,7 +2334,8 @@
 msgid "Specify output image filename"
 msgstr "Zvolte výstupní soubor obrázku"
 
-#: hugin1/nona_gui/nona_gui.cpp:210 hugin1/ptbatcher/Batch.cpp:599
+#: hugin1/nona_gui/nona_gui.cpp:210
+#: hugin1/ptbatcher/Batch.cpp:599
 msgid "No project files specified"
 msgstr "Nevybrány žádné soubory projektu"
 
@@ -2226,13 +2359,16 @@
 "Nelze vyčistit běžící dávku.\n"
 "Chcete jí zrušit?"
 
-#: hugin1/ptbatcher/Batch.cpp:229 hugin1/ptbatcher/BatchFrame.cpp:625
-#: hugin1/ptbatcher/BatchFrame.cpp:653 hugin1/ptbatcher/BatchFrame.cpp:674
+#: hugin1/ptbatcher/Batch.cpp:229
+#: hugin1/ptbatcher/BatchFrame.cpp:625
+#: hugin1/ptbatcher/BatchFrame.cpp:653
+#: hugin1/ptbatcher/BatchFrame.cpp:674
 #: hugin1/ptbatcher/ProjectArray.cpp:66
 msgid "In progress"
 msgstr "Probíhá"
 
-#: hugin1/ptbatcher/Batch.cpp:239 hugin1/ptbatcher/Batch.cpp:260
+#: hugin1/ptbatcher/Batch.cpp:239
+#: hugin1/ptbatcher/Batch.cpp:260
 msgid "Cleared batch."
 msgstr "Vyčištěná dávka."
 
@@ -2257,7 +2393,8 @@
 msgid "Initializing shutdown..."
 msgstr "Započínám s vypnutím..."
 
-#: hugin1/ptbatcher/Batch.cpp:491 hugin1/ptbatcher/Batch.cpp:496
+#: hugin1/ptbatcher/Batch.cpp:491
+#: hugin1/ptbatcher/Batch.cpp:496
 msgid "Shutting down..."
 msgstr "Vypínám..."
 
@@ -2366,7 +2503,8 @@
 msgid "No project selected. Open Hugin without project?"
 msgstr "Není vybrán projekt. Mám spustit  Hugin bez projektu?"
 
-#: hugin1/ptbatcher/BatchFrame.cpp:549 hugin1/ptbatcher/BatchFrame.cpp:597
+#: hugin1/ptbatcher/BatchFrame.cpp:549
+#: hugin1/ptbatcher/BatchFrame.cpp:597
 msgid "Question"
 msgstr "Dotaz"
 
@@ -2479,7 +2617,9 @@
 msgid "Output format"
 msgstr "Výstupní formát"
 
-#: hugin1/ptbatcher/ProjectListBox.cpp:56 translations/xrc.cpp:749 xrc.cpp:749
+#: hugin1/ptbatcher/ProjectListBox.cpp:56
+#: translations/xrc.cpp:744
+#: xrc.cpp:744
 msgid "Projection"
 msgstr "Projekce"
 
@@ -2504,12 +2644,10 @@
 #: hugin1/stitch_project/hugin_stitch_project.cpp:171
 msgid ""
 "Error during stitching\n"
-"Please report the complete text to the bug tracker on http://sf.net/projects/"
-"hugin."
+"Please report the complete text to the bug tracker on http://sf.net/projects/hugin."
 msgstr ""
 "Chyba během slepování\n"
-"Prosím nahlaste chybu  spolu s kompletním textem  do nástroje na sledování "
-"chyb na  http://sf.net/projects/hugin."
+"Prosím nahlaste chybu  spolu s kompletním textem  do nástroje na sledování chyb na  http://sf.net/projects/hugin."
 
 #: hugin1/stitch_project/hugin_stitch_project.cpp:137
 #, c-format
@@ -2520,451 +2658,594 @@
 "HuginStitchProject. Aplikace pro slepování hugin projektů.\n"
 " Verze: %s"
 
-#: translations/xrc.cpp:1 translations/xrc.cpp:314 translations/xrc.cpp:369
-#: translations/xrc.cpp:405 xrc.cpp:1 xrc.cpp:314 xrc.cpp:369 xrc.cpp:405
+#: translations/xrc.cpp:1
+#: translations/xrc.cpp:295
+#: translations/xrc.cpp:352
+#: translations/xrc.cpp:388
+#: xrc.cpp:1
+#: xrc.cpp:295
+#: xrc.cpp:352
+#: xrc.cpp:388
 msgid "About Hugin"
 msgstr "Co je Hugin"
 
-#: translations/xrc.cpp:2 xrc.cpp:2
+#: translations/xrc.cpp:2
+#: xrc.cpp:2
 msgid "version"
 msgstr "verze"
 
-#: translations/xrc.cpp:3 translations/xrc.cpp:406 xrc.cpp:3 xrc.cpp:406
+#: translations/xrc.cpp:3
+#: translations/xrc.cpp:389
+#: xrc.cpp:3
+#: xrc.cpp:389
 msgid "About"
 msgstr "O programu"
 
-#: translations/xrc.cpp:4 xrc.cpp:4
+#: translations/xrc.cpp:4
+#: xrc.cpp:4
 msgid "Authors"
 msgstr "Autoři"
 
-#: translations/xrc.cpp:5 xrc.cpp:5
+#: translations/xrc.cpp:5
+#: xrc.cpp:5
 msgid "Sponsors"
 msgstr "Sponzoři"
 
-#: translations/xrc.cpp:6 xrc.cpp:6
+#: translations/xrc.cpp:6
+#: xrc.cpp:6
 msgid "Upstream"
 msgstr "Původ"
 
-#: translations/xrc.cpp:7 xrc.cpp:7
+#: translations/xrc.cpp:7
+#: xrc.cpp:7
 msgid "License"
 msgstr "Licence"
 
-#: translations/xrc.cpp:8 translations/xrc.cpp:138 translations/xrc.cpp:693
-#: translations/xrc.cpp:780 xrc.cpp:8 xrc.cpp:138 xrc.cpp:693 xrc.cpp:780
+#: translations/xrc.cpp:8
+#: translations/xrc.cpp:133
+#: translations/xrc.cpp:416
+#: translations/xrc.cpp:689
+#: translations/xrc.cpp:775
+#: xrc.cpp:8
+#: xrc.cpp:133
+#: xrc.cpp:416
+#: xrc.cpp:689
+#: xrc.cpp:775
 msgid "OK"
 msgstr "OK"
 
-#: translations/xrc.cpp:9 xrc.cpp:9
+#: translations/xrc.cpp:9
+#: xrc.cpp:9
 msgid "Anchor Image"
 msgstr "Kotvící obrázek"
 
-#: translations/xrc.cpp:10 xrc.cpp:10
-msgid ""
-"Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
-msgstr ""
-"Nastavte Yaw a Pitch levým tlačítkem myši. Použijte pravé na nastavení roll."
+#: translations/xrc.cpp:10
+#: xrc.cpp:10
+msgid "Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
+msgstr "Nastavte Yaw a Pitch levým tlačítkem myši. Použijte pravé na nastavení roll."
 
-#: translations/xrc.cpp:11 xrc.cpp:11
+#: translations/xrc.cpp:11
+#: xrc.cpp:11
 msgid "Set Anchor Image Orientation"
 msgstr "Nastavení orientace kotvícího obrázku"
 
-#: translations/xrc.cpp:12 xrc.cpp:12
+#: translations/xrc.cpp:12
+#: xrc.cpp:12
 msgid "1. Load images..."
 msgstr "1. Nahrát obrázky..."
 
-#: translations/xrc.cpp:13 xrc.cpp:13
-#, fuzzy
+#: translations/xrc.cpp:13
+#: xrc.cpp:13
 msgid "Load a series of images"
-msgstr "nahrát sérii obrázků"
+msgstr "Nahrát sérii obrázků"
 
-#: translations/xrc.cpp:14 xrc.cpp:14
+#: translations/xrc.cpp:14
+#: xrc.cpp:14
 msgid "no images loaded"
 msgstr "Nejsou nahrány obrázky"
 
-#: translations/xrc.cpp:15 xrc.cpp:15
+#: translations/xrc.cpp:15
+#: xrc.cpp:15
 msgid "Automatic (use EXIF data)"
 msgstr "Automatické (dle dat z EXIFu)"
 
-#: translations/xrc.cpp:16 translations/xrc.cpp:34 xrc.cpp:16 xrc.cpp:34
+#: translations/xrc.cpp:16
+#: translations/xrc.cpp:31
+#: xrc.cpp:16
+#: xrc.cpp:31
 msgid "Lens type:"
 msgstr "Typ objektivu:"
 
-#: translations/xrc.cpp:22 translations/xrc.cpp:44 xrc.cpp:22 xrc.cpp:44
+#: translations/xrc.cpp:22
+#: translations/xrc.cpp:41
+#: xrc.cpp:22
+#: xrc.cpp:41
 msgid "Focal length:"
 msgstr "Ohnisková vzdálenost:"
 
-#: translations/xrc.cpp:23 translations/xrc.cpp:45 xrc.cpp:23 xrc.cpp:45
-msgid "mm"
-msgstr "mm"
-
-#: translations/xrc.cpp:24 translations/xrc.cpp:46 xrc.cpp:24 xrc.cpp:46
+#: translations/xrc.cpp:23
+#: translations/xrc.cpp:42
+#: xrc.cpp:23
+#: xrc.cpp:42
 msgid "Focal length multiplier:"
 msgstr "Násobitel ohniskové vzdálenosti:"
 
-#: translations/xrc.cpp:26 translations/xrc.cpp:238 xrc.cpp:26 xrc.cpp:238
+#: translations/xrc.cpp:24
+#: translations/xrc.cpp:223
+#: xrc.cpp:24
+#: xrc.cpp:223
 msgid "Load lens..."
 msgstr "Nahrát objektiv..."
 
-#: translations/xrc.cpp:27 translations/xrc.cpp:303 xrc.cpp:27 xrc.cpp:303
+#: translations/xrc.cpp:25
+#: translations/xrc.cpp:283
+#: xrc.cpp:25
+#: xrc.cpp:283
 msgid "Camera and Lens"
 msgstr "Fotoaparát a objektiv"
 
-#: translations/xrc.cpp:28 xrc.cpp:28
+#: translations/xrc.cpp:26
+#: xrc.cpp:26
 msgid "2. Align..."
 msgstr "2. Zarovnat..."
 
-#: translations/xrc.cpp:29 xrc.cpp:29
-msgid ""
-"Align all images. Creates control points and optimizes the image positions"
-msgstr ""
-"Zarovnat všechny obrázky. Vytvoří kontrolní body a optimalizuje umístění "
-"všech obrázků."
+#: translations/xrc.cpp:27
+#: xrc.cpp:27
+msgid "Align all images. Creates control points and optimizes the image positions"
+msgstr "Zarovnat všechny obrázky. Vytvoří kontrolní body a optimalizuje umístění všech obrázků."
 
-#: translations/xrc.cpp:30 xrc.cpp:30
+#: translations/xrc.cpp:28
+#: xrc.cpp:28
 msgid "3. Create panorama..."
 msgstr "3. Vytvořit panorama..."
 
-#: translations/xrc.cpp:31 xrc.cpp:31
-#, fuzzy
+#: translations/xrc.cpp:29
+#: xrc.cpp:29
 msgid "Create a high resolution panorama"
-msgstr "Vytvořit panorama ve vysokém rozlišení."
+msgstr "Vytvoří panorama ve vysokém rozlišení."
 
-#: translations/xrc.cpp:32 xrc.cpp:32
+#: translations/xrc.cpp:30
+#: xrc.cpp:30
 msgid "Camera and Lens data"
 msgstr "Data fotoaparátu a objektivu"
 
-#: translations/xrc.cpp:33 xrc.cpp:33
-msgid ""
-"a0123456789012345678901234567890123456789\n"
-"b\n"
-"c\n"
-"d\n"
-"e"
-msgstr ""
-"a0123456789012345678901234567890123456789\n"
-"b\n"
-"c\n"
-"d\n"
-"e"
-
-#: translations/xrc.cpp:40 xrc.cpp:40
+#: translations/xrc.cpp:37
+#: xrc.cpp:37
 msgid "Load lens data..."
 msgstr "Nahrát parametry objektivu..."
 
-#: translations/xrc.cpp:41 xrc.cpp:41
+#: translations/xrc.cpp:38
+#: xrc.cpp:38
 msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:"
-msgstr ""
-"Zadejte horizontální zorné pole (HFOV) nebo ohniskovou vzdálenost a ořezový "
-"faktor:"
+msgstr "Zadejte horizontální zorné pole (HFOV) nebo ohniskovou vzdálenost a ořezový faktor:"
 
-#: translations/xrc.cpp:42 xrc.cpp:42
+#: translations/xrc.cpp:39
+#: xrc.cpp:39
 msgid "HFOV (v):"
 msgstr "HFOV (v):"
 
-#: translations/xrc.cpp:43 translations/xrc.cpp:642 translations/xrc.cpp:644
-#: xrc.cpp:43 xrc.cpp:642 xrc.cpp:644
+#: translations/xrc.cpp:40
+#: translations/xrc.cpp:639
+#: translations/xrc.cpp:641
+#: xrc.cpp:40
+#: xrc.cpp:639
+#: xrc.cpp:641
 msgid "degrees"
 msgstr "stupňů"
 
-#: translations/xrc.cpp:48 xrc.cpp:48
+#: translations/xrc.cpp:43
+#: xrc.cpp:43
 msgid "Batch Processor"
 msgstr "Batch Processor"
 
-#: translations/xrc.cpp:49 xrc.cpp:49
+#: translations/xrc.cpp:44
+#: xrc.cpp:44
 msgid "Add application"
 msgstr "Přidat aplikaci"
 
-#: translations/xrc.cpp:50 xrc.cpp:50
+#: translations/xrc.cpp:45
+#: xrc.cpp:45
 msgid "Remove complete"
 msgstr "Odebrat dokončené"
 
-#: translations/xrc.cpp:51 xrc.cpp:51
+#: translations/xrc.cpp:46
+#: xrc.cpp:46
 msgid "Change prefix"
 msgstr "Změnit prefix"
 
-#: translations/xrc.cpp:52 xrc.cpp:52
+#: translations/xrc.cpp:47
+#: xrc.cpp:47
 msgid "Reset project"
 msgstr "Obnovit projekt"
 
-#: translations/xrc.cpp:53 xrc.cpp:53
+#: translations/xrc.cpp:48
+#: xrc.cpp:48
 msgid "Reset all"
 msgstr "Obnovit vše"
 
-#: translations/xrc.cpp:54 xrc.cpp:54
+#: translations/xrc.cpp:49
+#: xrc.cpp:49
 msgid "Edit with Hugin"
 msgstr "Hugin - otevřít pro úpravy"
 
-#: translations/xrc.cpp:55 xrc.cpp:55
+#: translations/xrc.cpp:50
+#: xrc.cpp:50
 msgid "Move project up"
 msgstr "Posunout nahoru"
 
-#: translations/xrc.cpp:56 xrc.cpp:56
+#: translations/xrc.cpp:51
+#: xrc.cpp:51
 msgid "Move project down"
 msgstr "Posunout dolů"
 
-#: translations/xrc.cpp:57 xrc.cpp:57
+#: translations/xrc.cpp:52
+#: xrc.cpp:52
 msgid "Parallel execution"
 msgstr "Paralelní běh"
 
-#: translations/xrc.cpp:58 xrc.cpp:58
+#: translations/xrc.cpp:53
+#: xrc.cpp:53
 msgid "Delete *.pto files"
 msgstr "Smazat .pto soubory"
 
-#: translations/xrc.cpp:59 xrc.cpp:59
+#: translations/xrc.cpp:54
+#: xrc.cpp:54
 msgid "Overwrite always"
 msgstr "Vždy přepisovat"
 
-#: translations/xrc.cpp:60 xrc.cpp:60
+#: translations/xrc.cpp:55
+#: xrc.cpp:55
 msgid "Shutdown when done"
 msgstr "Vypnout počítač po dokončení"
 
-#: translations/xrc.cpp:61 xrc.cpp:61
+#: translations/xrc.cpp:56
+#: xrc.cpp:56
 msgid "Verbose output"
 msgstr "Podrobný výstup"
 
-#: translations/xrc.cpp:62 translations/xrc.cpp:309 translations/xrc.cpp:315
-#: xrc.cpp:62 xrc.cpp:309 xrc.cpp:315
+#: translations/xrc.cpp:57
+#: translations/xrc.cpp:290
+#: translations/xrc.cpp:296
+#: xrc.cpp:57
+#: xrc.cpp:290
+#: xrc.cpp:296
 msgid "&File"
 msgstr "&Soubor"
 
-#: translations/xrc.cpp:63 xrc.cpp:63
+#: translations/xrc.cpp:58
+#: xrc.cpp:58
 msgid "Add project..."
 msgstr "Přidat projekt..."
 
-#: translations/xrc.cpp:64 xrc.cpp:64
+#: translations/xrc.cpp:59
+#: xrc.cpp:59
 msgid "Adds a project to the batch list."
 msgstr "Přidá projekty do seznamu v dávce."
 
-#: translations/xrc.cpp:65 translations/xrc.cpp:104 xrc.cpp:65 xrc.cpp:104
+#: translations/xrc.cpp:60
+#: translations/xrc.cpp:99
+#: xrc.cpp:60
+#: xrc.cpp:99
 msgid "Remove project"
 msgstr "Odebrat projekt"
 
-#: translations/xrc.cpp:66 translations/xrc.cpp:105 xrc.cpp:66 xrc.cpp:105
+#: translations/xrc.cpp:61
+#: translations/xrc.cpp:100
+#: xrc.cpp:61
+#: xrc.cpp:100
 msgid "Removes selected project from the batch list"
 msgstr "Odebere vybrané projekty z dávky"
 
-#: translations/xrc.cpp:67 translations/xrc.cpp:107 xrc.cpp:67 xrc.cpp:107
+#: translations/xrc.cpp:62
+#: translations/xrc.cpp:102
+#: xrc.cpp:62
+#: xrc.cpp:102
 msgid "Search directory"
 msgstr "Hledaný adresář"
 
-#: translations/xrc.cpp:68 translations/xrc.cpp:108 xrc.cpp:68 xrc.cpp:108
+#: translations/xrc.cpp:63
+#: translations/xrc.cpp:103
+#: xrc.cpp:63
+#: xrc.cpp:103
 msgid "Appends all project files from a directory and subdirectories"
 msgstr "Přidá všechny projekty z adresáře i podadresářů"
 
-#: translations/xrc.cpp:69 translations/xrc.cpp:83 xrc.cpp:69 xrc.cpp:83
+#: translations/xrc.cpp:64
+#: translations/xrc.cpp:78
+#: xrc.cpp:64
+#: xrc.cpp:78
 msgid "Open batch"
 msgstr "Otevřít dávku"
 
-#: translations/xrc.cpp:70 translations/xrc.cpp:84 xrc.cpp:70 xrc.cpp:84
+#: translations/xrc.cpp:65
+#: translations/xrc.cpp:79
+#: xrc.cpp:65
+#: xrc.cpp:79
 msgid "Opens a batch file with a list of projects"
 msgstr "Otevře dávku se seznamem projektů"
 
-#: translations/xrc.cpp:71 translations/xrc.cpp:86 xrc.cpp:71 xrc.cpp:86
+#: translations/xrc.cpp:66
+#: translations/xrc.cpp:81
+#: xrc.cpp:66
+#: xrc.cpp:81
 msgid "Save batch"
 msgstr "Uložit dávku"
 
-#: translations/xrc.cpp:72 translations/xrc.cpp:87 xrc.cpp:72 xrc.cpp:87
+#: translations/xrc.cpp:67
+#: translations/xrc.cpp:82
+#: xrc.cpp:67
+#: xrc.cpp:82
 msgid "Saves a batch file with a list of projects"
 msgstr "Uloží dávku se seznamem projektů"
 
-#: translations/xrc.cpp:73 translations/xrc.cpp:80 xrc.cpp:73 xrc.cpp:80
+#: translations/xrc.cpp:68
+#: translations/xrc.cpp:75
+#: xrc.cpp:68
+#: xrc.cpp:75
 msgid "Clear batch"
 msgstr "Vyčistit dávku"
 
-#: translations/xrc.cpp:74 translations/xrc.cpp:81 xrc.cpp:74 xrc.cpp:81
+#: translations/xrc.cpp:69
+#: translations/xrc.cpp:76
+#: xrc.cpp:69
+#: xrc.cpp:76
 msgid "Clears the batch list"
 msgstr "Vymazat seznam dávek"
 
-#: translations/xrc.cpp:75 translations/xrc.cpp:337 xrc.cpp:75 xrc.cpp:337
+#: translations/xrc.cpp:70
+#: translations/xrc.cpp:318
+#: xrc.cpp:70
+#: xrc.cpp:318
 msgid "&Quit"
 msgstr "&Konec"
 
-#: translations/xrc.cpp:76 translations/xrc.cpp:338 xrc.cpp:76 xrc.cpp:338
+#: translations/xrc.cpp:71
+#: translations/xrc.cpp:319
+#: xrc.cpp:71
+#: xrc.cpp:319
 msgid "Exit program"
 msgstr "Skončí program"
 
-#: translations/xrc.cpp:78 xrc.cpp:78
+#: translations/xrc.cpp:73
+#: xrc.cpp:73
 msgid "Batch Stitcher help"
 msgstr "Nápověda pro Batch Stitcher"
 
-#: translations/xrc.cpp:79 xrc.cpp:79
+#: translations/xrc.cpp:74
+#: xrc.cpp:74
 msgid "Open Batch Stitcher help."
 msgstr "Otevře nápovědu pro Batch Stitcher"
 
-#: translations/xrc.cpp:82 xrc.cpp:82
+#: translations/xrc.cpp:77
+#: xrc.cpp:77
 msgid "clear"
 msgstr "vyčistit"
 
-#: translations/xrc.cpp:85 xrc.cpp:85
+#: translations/xrc.cpp:80
+#: xrc.cpp:80
 msgid "open"
 msgstr "otevřít"
 
-#: translations/xrc.cpp:88 xrc.cpp:88
+#: translations/xrc.cpp:83
+#: xrc.cpp:83
 msgid "save"
 msgstr "uložit"
 
-#: translations/xrc.cpp:89 xrc.cpp:89
+#: translations/xrc.cpp:84
+#: xrc.cpp:84
 msgid "Start batch"
 msgstr "Spustit dávku"
 
-#: translations/xrc.cpp:90 xrc.cpp:90
+#: translations/xrc.cpp:85
+#: xrc.cpp:85
 msgid "Starts batch execution"
 msgstr "Spustí běh dávky"
 
-#: translations/xrc.cpp:91 xrc.cpp:91
+#: translations/xrc.cpp:86
+#: xrc.cpp:86
 msgid "start"
 msgstr "start"
 
-#: translations/xrc.cpp:92 xrc.cpp:92
+#: translations/xrc.cpp:87
+#: xrc.cpp:87
 msgid "Skip project(s)"
 msgstr "Přeskočit projekt(y)"
 
-#: translations/xrc.cpp:93 xrc.cpp:93
+#: translations/xrc.cpp:88
+#: xrc.cpp:88
 msgid "Skips execution of currently running project(s)"
 msgstr "Přeskočí spouštění právě běžících projektů"
 
-#: translations/xrc.cpp:94 xrc.cpp:94
+#: translations/xrc.cpp:89
+#: xrc.cpp:89
 msgid "skip"
 msgstr "přeskočit"
 
-#: translations/xrc.cpp:95 xrc.cpp:95
+#: translations/xrc.cpp:90
+#: xrc.cpp:90
 msgid "Pause batch"
 msgstr "Pozastavit dávku"
 
-#: translations/xrc.cpp:96 xrc.cpp:96
+#: translations/xrc.cpp:91
+#: xrc.cpp:91
 msgid "Pauses batch execution"
 msgstr "Pozastaví běh dávky"
 
-#: translations/xrc.cpp:97 xrc.cpp:97
+#: translations/xrc.cpp:92
+#: xrc.cpp:92
 msgid "pause"
 msgstr "pozastavit"
 
-#: translations/xrc.cpp:98 xrc.cpp:98
+#: translations/xrc.cpp:93
+#: xrc.cpp:93
 msgid "Cancel batch"
 msgstr "Zrušit dávku"
 
-#: translations/xrc.cpp:99 xrc.cpp:99
+#: translations/xrc.cpp:94
+#: xrc.cpp:94
 msgid "Cancels batch execution"
 msgstr "Zruší běh dávky"
 
-#: translations/xrc.cpp:100 xrc.cpp:100
+#: translations/xrc.cpp:95
+#: xrc.cpp:95
 msgid "cancel"
 msgstr "zrušit"
 
-#: translations/xrc.cpp:101 xrc.cpp:101
+#: translations/xrc.cpp:96
+#: xrc.cpp:96
 msgid "Add project(s)"
 msgstr "Přidat projekt(y)"
 
-#: translations/xrc.cpp:102 xrc.cpp:102
+#: translations/xrc.cpp:97
+#: xrc.cpp:97
 msgid "Appends project file(s) to the batch list"
 msgstr "Přidá projekty do dávky"
 
-#: translations/xrc.cpp:103 xrc.cpp:103
+#: translations/xrc.cpp:98
+#: xrc.cpp:98
 msgid "add"
 msgstr "přidat"
 
-#: translations/xrc.cpp:106 xrc.cpp:106
+#: translations/xrc.cpp:101
+#: xrc.cpp:101
 msgid "remove"
 msgstr "odebrat"
 
-#: translations/xrc.cpp:109 xrc.cpp:109
+#: translations/xrc.cpp:104
+#: xrc.cpp:104
 msgid "adddir"
 msgstr "addir"
 
-#: translations/xrc.cpp:110 xrc.cpp:110
+#: translations/xrc.cpp:105
+#: xrc.cpp:105
 msgid "Description:"
 msgstr "Popis:"
 
-#: translations/xrc.cpp:111 translations/xrc.cpp:251 translations/xrc.cpp:295
-#: xrc.cpp:111 xrc.cpp:251 xrc.cpp:295
+#: translations/xrc.cpp:106
+#: translations/xrc.cpp:236
+#: translations/xrc.cpp:275
+#: xrc.cpp:106
+#: xrc.cpp:236
+#: xrc.cpp:275
 msgid "Type:"
 msgstr "druh:"
 
-#: translations/xrc.cpp:112 xrc.cpp:112
+#: translations/xrc.cpp:107
+#: xrc.cpp:107
 msgid "Autopano (by A. Jenny)"
 msgstr "Autopano (autor A. Jenny)"
 
-#: translations/xrc.cpp:113 xrc.cpp:113
-#, fuzzy
+#: translations/xrc.cpp:108
+#: xrc.cpp:108
 msgid "All images at once"
-msgstr "Přidat obrázek: zrušit"
+msgstr "Všechny obrázky najednou"
 
-#: translations/xrc.cpp:114 xrc.cpp:114
+#: translations/xrc.cpp:109
+#: xrc.cpp:109
 msgid "Panorama with stacks"
-msgstr ""
+msgstr "Panorama se štosy"
 
-#: translations/xrc.cpp:115 xrc.cpp:115
-#, fuzzy
+#: translations/xrc.cpp:110
+#: xrc.cpp:110
 msgid "Multi-row panorama"
-msgstr "Náhled panoramatu"
+msgstr "Víceřadé panorama"
 
-#: translations/xrc.cpp:116 xrc.cpp:116
+#: translations/xrc.cpp:111
+#: xrc.cpp:111
 msgid "Multi-row panorama with stacks"
-msgstr ""
+msgstr "Víceřadé panorama se štosy"
 
-#: translations/xrc.cpp:117 xrc.cpp:117
-#, fuzzy
+#: translations/xrc.cpp:112
+#: xrc.cpp:112
 msgid "Prealigned panorama"
-msgstr "Náhled panoramatu"
+msgstr "Předzarovnané panorama"
 
-#: translations/xrc.cpp:118 xrc.cpp:118
+#: translations/xrc.cpp:113
+#: xrc.cpp:113
 msgid "Detector"
 msgstr "Detektor"
 
-#: translations/xrc.cpp:119 xrc.cpp:119
+#: translations/xrc.cpp:114
+#: xrc.cpp:114
 msgid "One step detector"
-msgstr ""
+msgstr "Jednostupňový detektor"
 
-#: translations/xrc.cpp:120 translations/xrc.cpp:132 xrc.cpp:120 xrc.cpp:132
+#: translations/xrc.cpp:115
+#: translations/xrc.cpp:127
+#: xrc.cpp:115
+#: xrc.cpp:127
 msgid "Program:"
 msgstr "Program:"
 
-#: translations/xrc.cpp:121 translations/xrc.cpp:125 translations/xrc.cpp:128
-#: translations/xrc.cpp:133 translations/xrc.cpp:618 translations/xrc.cpp:672
-#: translations/xrc.cpp:678 translations/xrc.cpp:697 xrc.cpp:121 xrc.cpp:125
-#: xrc.cpp:128 xrc.cpp:133 xrc.cpp:618 xrc.cpp:672 xrc.cpp:678 xrc.cpp:697
+#: translations/xrc.cpp:116
+#: translations/xrc.cpp:120
+#: translations/xrc.cpp:123
+#: translations/xrc.cpp:128
+#: translations/xrc.cpp:615
+#: translations/xrc.cpp:668
+#: translations/xrc.cpp:674
+#: translations/xrc.cpp:692
+#: xrc.cpp:116
+#: xrc.cpp:120
+#: xrc.cpp:123
+#: xrc.cpp:128
+#: xrc.cpp:615
+#: xrc.cpp:668
+#: xrc.cpp:674
+#: xrc.cpp:692
 msgid "Choose..."
 msgstr "Vybrat..."
 
-#: translations/xrc.cpp:122 translations/xrc.cpp:126 translations/xrc.cpp:129
-#: translations/xrc.cpp:134 translations/xrc.cpp:619 xrc.cpp:122 xrc.cpp:126
-#: xrc.cpp:129 xrc.cpp:134 xrc.cpp:619
+#: translations/xrc.cpp:117
+#: translations/xrc.cpp:121
+#: translations/xrc.cpp:124
+#: translations/xrc.cpp:129
+#: translations/xrc.cpp:616
+#: xrc.cpp:117
+#: xrc.cpp:121
+#: xrc.cpp:124
+#: xrc.cpp:129
+#: xrc.cpp:616
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: translations/xrc.cpp:123 xrc.cpp:123
+#: translations/xrc.cpp:118
+#: xrc.cpp:118
 msgid "Two step detector"
-msgstr ""
+msgstr "Vícestupňový detektor"
 
-#: translations/xrc.cpp:124 xrc.cpp:124
+#: translations/xrc.cpp:119
+#: xrc.cpp:119
 msgid "Feature descriptor:"
-msgstr ""
+msgstr "Popisovač vlastností:"
 
-#: translations/xrc.cpp:127 xrc.cpp:127
-#, fuzzy
+#: translations/xrc.cpp:122
+#: xrc.cpp:122
 msgid "Feature matcher:"
-msgstr "Datum:"
+msgstr "Vyhledávač charakteristik:"
 
-#: translations/xrc.cpp:130 xrc.cpp:130
+#: translations/xrc.cpp:125
+#: xrc.cpp:125
 msgid "Detector for stacks"
-msgstr ""
+msgstr "Detektor štosů"
 
-#: translations/xrc.cpp:131 xrc.cpp:131
+#: translations/xrc.cpp:126
+#: xrc.cpp:126
 msgid "Leave empty, when no control point detector should run on stacks."
-msgstr ""
+msgstr "Ponechte prázdné, pokud žádný detektor kontrolních bodů nemá běhat se štosy."
 
-#: translations/xrc.cpp:135 xrc.cpp:135
-#, fuzzy
+#: translations/xrc.cpp:130
+#: xrc.cpp:130
 msgid "Advanced option"
 msgstr "Pokročilé nastavení"
 
-#: translations/xrc.cpp:136 xrc.cpp:136
-#, fuzzy
+#: translations/xrc.cpp:131
+#: xrc.cpp:131
 msgid "This setting has no advanced options."
-msgstr "Tento režim slučování nemá žádná další nastavení."
+msgstr "Toto nastavení. nemá žádné pokročilé možnosti."
 
-#: translations/xrc.cpp:137 xrc.cpp:137
-#, fuzzy
+#: translations/xrc.cpp:132
+#: xrc.cpp:132
 msgid ""
 "following patterns will be substituted before running:\n"
 "%o  -- output project (0.oto will be appended when using Autopano)\n"
@@ -2980,988 +3261,1332 @@
 "%o  -- výstupní projekt (0.oto bude připojeno, použije li se Autopano)\n"
 "%p  -- počet kontrolních bodů mezi každým párem\n"
 "%v  -- HFOV prvního obrázku\n"
-"%t  -- projekce prvního obrázku (0-4, stejně jako v panotools)\n"
+"%f  -- projekce prvního obrázku (0-4, stejně jako v panotools)\n"
 "%i  -- obrazové soubory\n"
 "%namefile -- soubor, který obsahuje názvy souborů s obrázky\n"
-"%s -- vstupní panotools skript"
+"%s -- vstupní panotools skript\n"
+"%k -- průběžné soubory s klíči"
 
-#: translations/xrc.cpp:140 xrc.cpp:140
+#: translations/xrc.cpp:135
+#: xrc.cpp:135
 msgid "Parameters for Control Point Detectors"
 msgstr "Nastavení pro detektor kontrolních bodů"
 
-#: translations/xrc.cpp:141 xrc.cpp:141
+#: translations/xrc.cpp:136
+#: xrc.cpp:136
 msgid "previous image pair"
 msgstr "předchozí obrázkový pár"
 
-#: translations/xrc.cpp:142 xrc.cpp:142
+#: translations/xrc.cpp:137
+#: xrc.cpp:137
 msgid "next image pair"
 msgstr "další obrázkový pár"
 
-#: translations/xrc.cpp:143 translations/xrc.cpp:145 translations/xrc.cpp:291
-#: xrc.cpp:143 xrc.cpp:145 xrc.cpp:291
-msgid "x:"
-msgstr "x:"
-
-#: translations/xrc.cpp:144 translations/xrc.cpp:146 translations/xrc.cpp:292
-#: translations/xrc.cpp:798 xrc.cpp:144 xrc.cpp:146 xrc.cpp:292 xrc.cpp:798
-msgid "y:"
-msgstr "y:"
-
-#: translations/xrc.cpp:147 xrc.cpp:147
+#: translations/xrc.cpp:138
+#: xrc.cpp:138
 msgid "mode:"
 msgstr "mód:"
 
-#: translations/xrc.cpp:149 xrc.cpp:149
+#: translations/xrc.cpp:140
+#: xrc.cpp:140
 msgid "vertical line"
 msgstr "svislá  čára"
 
-#: translations/xrc.cpp:150 xrc.cpp:150
+#: translations/xrc.cpp:141
+#: xrc.cpp:141
 msgid "horizontal line"
 msgstr "vodorovná čára"
 
-#: translations/xrc.cpp:151 xrc.cpp:151
+#: translations/xrc.cpp:142
+#: translations/xrc.cpp:399
+#: xrc.cpp:142
+#: xrc.cpp:399
 msgid "Zoom:"
 msgstr "Zvětšení:"
 
-#: translations/xrc.cpp:152 xrc.cpp:152
-msgid "100%"
-msgstr "100%"
-
-#: translations/xrc.cpp:153 xrc.cpp:153
+#: translations/xrc.cpp:143
+#: translations/xrc.cpp:400
+#: xrc.cpp:143
+#: xrc.cpp:400
 msgid "fit to window"
 msgstr "přizpůsobit oknu"
 
-#: translations/xrc.cpp:154 xrc.cpp:154
-msgid "200%"
-msgstr "200%"
-
-#: translations/xrc.cpp:155 xrc.cpp:155
-msgid "150%"
-msgstr "150%"
-
-#: translations/xrc.cpp:156 xrc.cpp:156
-msgid "75%"
-msgstr "75%"
-
-#: translations/xrc.cpp:157 xrc.cpp:157
-msgid "50%"
-msgstr "50%"
-
-#: translations/xrc.cpp:158 xrc.cpp:158
-msgid "25%"
-msgstr "25%"
-
-#: translations/xrc.cpp:159 translations/xrc.cpp:628 xrc.cpp:159 xrc.cpp:628
+#: translations/xrc.cpp:144
+#: translations/xrc.cpp:625
+#: xrc.cpp:144
+#: xrc.cpp:625
 msgid "Fine-tune"
 msgstr "Doladit"
 
-#: translations/xrc.cpp:160 xrc.cpp:160
-#, fuzzy
+#: translations/xrc.cpp:145
+#: xrc.cpp:145
 msgid "Tries to optimize the currently active point"
-msgstr "Zkusí optimalizovat právě aktivní bod."
+msgstr "Zkusí optimalizovat právě aktivní bod"
 
-#: translations/xrc.cpp:161 translations/xrc.cpp:682 xrc.cpp:161 xrc.cpp:682
+#: translations/xrc.cpp:146
+#: translations/xrc.cpp:678
+#: xrc.cpp:146
+#: xrc.cpp:678
 msgid "Celeste"
 msgstr "Celeste"
 
-#: translations/xrc.cpp:162 translations/xrc.cpp:199 xrc.cpp:162 xrc.cpp:199
+#: translations/xrc.cpp:147
+#: translations/xrc.cpp:184
+#: xrc.cpp:147
+#: xrc.cpp:184
 msgid "Tries to remove control points from clouds"
 msgstr "Pokusí se odebrat kontrolní body z mraků"
 
-#: translations/xrc.cpp:163 xrc.cpp:163
+#: translations/xrc.cpp:148
+#: xrc.cpp:148
 msgid "auto fine-&tune"
 msgstr "au&todoladit"
 
-#: translations/xrc.cpp:164 xrc.cpp:164
+#: translations/xrc.cpp:149
+#: xrc.cpp:149
 msgid "auto add"
 msgstr "autopřidat"
 
-#: translations/xrc.cpp:165 xrc.cpp:165
+#: translations/xrc.cpp:150
+#: xrc.cpp:150
 msgid "immediately add control point when selecting a second point"
 msgstr "okamžitě přidat druhý kontrolní bod při výběru druhého bodu"
 
-#: translations/xrc.cpp:166 xrc.cpp:166
+#: translations/xrc.cpp:151
+#: xrc.cpp:151
 msgid "auto estimate"
 msgstr "automaticky odhadnout"
 
-#: translations/xrc.cpp:167 xrc.cpp:167
-msgid ""
-"tries to estimate shift between the images and use it while placing control "
-"points"
-msgstr ""
-"Zkusí odhadnout posun mezi obrázky a použít jej při umísťování kontrolních "
-"bodů."
+#: translations/xrc.cpp:152
+#: xrc.cpp:152
+msgid "tries to estimate shift between the images and use it while placing control points"
+msgstr "Zkusí odhadnout posun mezi obrázky a použít jej při umísťování kontrolních bodů."
 
-#: translations/xrc.cpp:168 xrc.cpp:168
+#: translations/xrc.cpp:153
+#: xrc.cpp:153
 msgid "&Delete"
 msgstr "Sma&zat"
 
-#: translations/xrc.cpp:169 xrc.cpp:169
+#: translations/xrc.cpp:154
+#: xrc.cpp:154
 msgid "&Add"
 msgstr "Přid&at"
 
-#: translations/xrc.cpp:170 xrc.cpp:170
+#: translations/xrc.cpp:155
+#: xrc.cpp:155
 msgid "add a new Point"
 msgstr "přidat nový bod"
 
-#: translations/xrc.cpp:171 translations/xrc.cpp:305 xrc.cpp:171 xrc.cpp:305
+#: translations/xrc.cpp:156
+#: translations/xrc.cpp:286
+#: xrc.cpp:156
+#: xrc.cpp:286
 msgid "Control Points"
 msgstr "Kontrolní body"
 
-#: translations/xrc.cpp:172 translations/xrc.cpp:650 xrc.cpp:172 xrc.cpp:650
+#: translations/xrc.cpp:157
+#: translations/xrc.cpp:647
+#: xrc.cpp:157
+#: xrc.cpp:647
 msgid "Delete"
 msgstr "Smazat"
 
-#: translations/xrc.cpp:173 xrc.cpp:173
+#: translations/xrc.cpp:158
+#: xrc.cpp:158
 msgid "Select by Distance"
 msgstr "Vybrat dle vzdálenosti"
 
-#: translations/xrc.cpp:174 xrc.cpp:174
+#: translations/xrc.cpp:159
+#: xrc.cpp:159
 msgid "Top:"
 msgstr "Horní:"
 
-#: translations/xrc.cpp:175 xrc.cpp:175
+#: translations/xrc.cpp:160
+#: xrc.cpp:160
 msgid "Left:"
 msgstr "Levá:"
 
-#: translations/xrc.cpp:176 xrc.cpp:176
+#: translations/xrc.cpp:161
+#: xrc.cpp:161
 msgid "Right:"
 msgstr "Pravá:"
 
-#: translations/xrc.cpp:177 xrc.cpp:177
+#: translations/xrc.cpp:162
+#: xrc.cpp:162
 msgid "Bottom:"
 msgstr "Spodní:"
 
-#: translations/xrc.cpp:178 xrc.cpp:178
+#: translations/xrc.cpp:163
+#: xrc.cpp:163
 msgid "Always center Crop on d,e"
 msgstr "Vždy vycentrovat ořezání na d,e"
 
-#: translations/xrc.cpp:179 translations/xrc.cpp:217 translations/xrc.cpp:770
-#: xrc.cpp:179 xrc.cpp:217 xrc.cpp:770
+#: translations/xrc.cpp:164
+#: translations/xrc.cpp:202
+#: translations/xrc.cpp:765
+#: xrc.cpp:164
+#: xrc.cpp:202
+#: xrc.cpp:765
 msgid "Reset"
 msgstr "Obnovit"
 
-#: translations/xrc.cpp:180 xrc.cpp:180
+#: translations/xrc.cpp:165
+#: xrc.cpp:165
 msgid "Edit Panorama Tools Script"
 msgstr "Editovat skript Panorama Tools"
 
-#: translations/xrc.cpp:181 xrc.cpp:181
-msgid ""
-"This is the script which will be sent to the Panorama Tools engine.  Editing "
-"these lines is an advanced technique."
-msgstr ""
-"Toto je skript, který bude odeslán do Panorama Tools. Editování těchto řádek "
-"je pro zkušené uživatele."
+#: translations/xrc.cpp:166
+#: xrc.cpp:166
+msgid "This is the script which will be sent to the Panorama Tools engine.  Editing these lines is an advanced technique."
+msgstr "Toto je skript, který bude odeslán do Panorama Tools. Editování těchto řádek je pro zkušené uživatele."
 
-#: translations/xrc.cpp:182 xrc.cpp:182
+#: translations/xrc.cpp:167
+#: xrc.cpp:167
 msgid "Continue with these changes"
 msgstr "Pokračovat s těmito změnami"
 
-#: translations/xrc.cpp:183 xrc.cpp:183
+#: translations/xrc.cpp:168
+#: xrc.cpp:168
 msgid "Discard changes and cancel"
 msgstr "Zahodit změny a zrušit"
 
-#: translations/xrc.cpp:184 xrc.cpp:184
+#: translations/xrc.cpp:169
+#: xrc.cpp:169
 msgid "Add individual images..."
 msgstr "Přidat jednotlivé obrázky..."
 
-#: translations/xrc.cpp:185 xrc.cpp:185
-#, fuzzy
+#: translations/xrc.cpp:170
+#: xrc.cpp:170
 msgid "Load one or more pictures for this project"
-msgstr "Nahrát jednu či více fotografií do tohoto projektu"
+msgstr "Nahraje jeden či více obrázků do tohoto projektu"
 
-#: translations/xrc.cpp:186 xrc.cpp:186
+#: translations/xrc.cpp:171
+#: xrc.cpp:171
 msgid "Add time-series of images..."
 msgstr "Přidat časové série..."
 
-#: translations/xrc.cpp:187 xrc.cpp:187
-#, fuzzy
+#: translations/xrc.cpp:172
+#: xrc.cpp:172
 msgid "Load a set of pictures taken at the same time"
-msgstr "Nahrát skupinu fotek vyfocených ve stejný čas"
+msgstr "Nahraje skupinu obrázků pořízených ve stejnou chvíli"
 
-#: translations/xrc.cpp:188 translations/xrc.cpp:651 xrc.cpp:188 xrc.cpp:651
+#: translations/xrc.cpp:173
+#: translations/xrc.cpp:648
+#: xrc.cpp:173
+#: xrc.cpp:648
 msgid "Move up"
 msgstr "Nahoru"
 
-#: translations/xrc.cpp:189 translations/xrc.cpp:652 xrc.cpp:189 xrc.cpp:652
+#: translations/xrc.cpp:174
+#: translations/xrc.cpp:649
+#: xrc.cpp:174
+#: xrc.cpp:649
 msgid "Move down"
 msgstr "Dolů"
 
-#: translations/xrc.cpp:190 xrc.cpp:190
+#: translations/xrc.cpp:175
+#: xrc.cpp:175
 msgid "Remove selected image(s)"
 msgstr "Odebrat vybrané obrázky"
 
-#: translations/xrc.cpp:191 xrc.cpp:191
+#: translations/xrc.cpp:176
+#: xrc.cpp:176
 msgid "Remove the selected images from this project"
 msgstr "Odebrat vybrané obrázky z projektu"
 
-#: translations/xrc.cpp:192 xrc.cpp:192
+#: translations/xrc.cpp:177
+#: xrc.cpp:177
 msgid "New stack"
-msgstr ""
+msgstr "Nový štos"
 
-#: translations/xrc.cpp:193 xrc.cpp:193
+#: translations/xrc.cpp:178
+#: xrc.cpp:178
 msgid "Link the positions of the selected images only with themselves"
-msgstr ""

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5028
          http://hugin.svn.sourceforge.net/hugin/?rev=5028&view=rev
Author:   gpatters1
Date:     2010-02-27 04:31:03 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
[2889525] Reject control ponits with coordinates less than zero.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp

Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp	2010-02-26 06:21:45 UTC (rev 5027)
+++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp	2010-02-27 04:31:03 UTC (rev 5028)
@@ -469,8 +469,10 @@
         PT::ControlPoint point = *it;
         SrcPanoImage img1 = pano.getSrcImage(point.image1Nr);
         SrcPanoImage img2 = pano.getSrcImage(point.image2Nr);
-        if (point.x1 > img1.getSize().x || point.y1 > img1.getSize().y ||
-           point.x2 > img2.getSize().x || point.y2 > img2.getSize().y) 
+        if (0 > point.x1 || point.x1 > img1.getSize().x || 
+            0 > point.y1 || point.y1 > img1.getSize().y ||
+            0 > point.x2 || point.x2 > img2.getSize().x || 
+            0 > point.y2 || point.y2 > img2.getSize().y) 
         {
             bad_cp_count++;
         } else 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5027
          http://hugin.svn.sourceforge.net/hugin/?rev=5027&view=rev
Author:   tmodes
Date:     2010-02-26 06:21:45 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
Set blender and fusion options to default value when user entered an empty string

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/PanoPanel.cpp

Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp	2010-02-24 23:39:00 UTC (rev 5026)
+++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp	2010-02-26 06:21:45 UTC (rev 5027)
@@ -815,6 +815,10 @@
             if (enblend_opts_text->GetValue().length() > 0) {
                 opt.enblendOptions = enblend_opts_text->GetValue().mb_str(wxConvLocal);
             }
+            else
+            {
+                opt.enblendOptions = wxConfigBase::Get()->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal);
+            };
             GlobalCmdHist::getInstance().addCommand(
                 new PT::SetPanoOptionsCmd( *pano, opt )
                 );
@@ -843,6 +847,10 @@
         if (enfuse_opts_text->GetValue().length() > 0) {
             opt.enfuseOptions = enfuse_opts_text->GetValue().mb_str(wxConvLocal);
         }
+        else
+        {
+            opt.enfuseOptions = wxConfigBase::Get()->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal);
+        };
         GlobalCmdHist::getInstance().addCommand(
             new PT::SetPanoOptionsCmd( *pano, opt )
             );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5026
          http://hugin.svn.sourceforge.net/hugin/?rev=5026&view=rev
Author:   brunopostle
Date:     2010-02-24 23:39:00 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
merge trunk -r 5022 Initalise PanoramaOptions::outputLDRExposureLayersFused to false to prevent random behviour. Found with valgrind (James Legg)

Modified Paths:
--------------
    hugin/releases/2010.0/src/hugin_base/panodata/PanoramaOptions.h

Modified: hugin/releases/2010.0/src/hugin_base/panodata/PanoramaOptions.h
===================================================================
--- hugin/releases/2010.0/src/hugin_base/panodata/PanoramaOptions.h	2010-02-24 17:15:43 UTC (rev 5025)
+++ hugin/releases/2010.0/src/hugin_base/panodata/PanoramaOptions.h	2010-02-24 23:39:00 UTC (rev 5026)
@@ -219,6 +219,7 @@
             outputLDRLayers = false;
             outputLDRExposureRemapped = false;
             outputLDRExposureLayers = false;
+            outputLDRExposureLayersFused = false;
             outputLDRExposureBlended = false;
             outputHDRBlended = false;
             outputHDRLayers = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5025
          http://hugin.svn.sourceforge.net/hugin/?rev=5025&view=rev
Author:   brunopostle
Date:     2010-02-24 17:15:43 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
merge trunk -r 5024 Make `hugin *.jpg` work (Alexandre Duret-Lutz)

Modified Paths:
--------------
    hugin/releases/2010.0/src/hugin1/hugin/huginApp.cpp

Modified: hugin/releases/2010.0/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/releases/2010.0/src/hugin1/hugin/huginApp.cpp	2010-02-24 17:12:21 UTC (rev 5024)
+++ hugin/releases/2010.0/src/hugin1/hugin/huginApp.cpp	2010-02-24 17:15:43 UTC (rev 5025)
@@ -335,10 +335,14 @@
                 filename.Prepend(wxFileName::GetPathSeparator());
                 filename.Prepend(cwd);
             }
+	    // Loading the project file with set actualPath to its
+	    // parent directory.  (actualPath is used as starting
+	    // directory by many subsequent file selection dialogs.)
             frame->LoadProjectFile(filename);
         } else {
             std::vector<std::string> filesv;
             for (int i=1; i< argc; i++) {
+		bool actualPathSet = false;
                 wxFileName file(argv[i]);
                 if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 ||
                     file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ||
@@ -352,7 +356,21 @@
                     file.GetExt().CmpNoCase(wxT("hdr")) == 0 ||
                     file.GetExt().CmpNoCase(wxT("viff")) == 0 )
                 {
-                    filesv.push_back((const char *)(file.GetFullPath().mb_str(HUGIN_CONV_FILENAME)));
+		    wxString filename(argv[i]);
+		    // Make sure the filename is absolute.
+		    if (! wxIsAbsolutePath(filename)) {
+			filename.Prepend(wxFileName::GetPathSeparator());
+			filename.Prepend(cwd);
+		    }
+
+                    filesv.push_back((const char *)(filename.mb_str(HUGIN_CONV_FILENAME)));
+
+		    // Use the first filename to set actualPath.
+		    if (! actualPathSet) {
+			file = filename;
+			config->Write(wxT("/actualPath"), file.GetPath());
+			actualPathSet = true;
+		    }
                 }
             }
             GlobalCmdHist::getInstance().addCommand(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5023
          http://hugin.svn.sourceforge.net/hugin/?rev=5023&view=rev
Author:   jlegg
Date:     2010-02-24 01:59:03 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
Fix use of uninitalised memory in MaskImageCtrl and PreviewLayoutLinesTool.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
    hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp

Modified: hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-24 00:45:16 UTC (rev 5022)
+++ hugin/trunk/src/hugin1/hugin/MaskImageCtrl.cpp	2010-02-24 01:59:03 UTC (rev 5023)
@@ -69,6 +69,7 @@
     scaleFactor = 1;
     fitToWindow = false;
     m_previewOnly = false;
+    m_activeMask = UINT_MAX;
 
     return true;
 }
@@ -760,15 +761,15 @@
         //and now the actual polygon
         if(maskEditState==POINTS_ADDING || maskEditState==POINTS_MOVING || maskEditState==NEW_POLYGON_CREATING)
             DrawPolygon(dc,m_editingMask,true,true);
-	}
+    }
     else
     {
-		// clear the rectangle and exit
+        // clear the rectangle and exit
         dc.SetPen(wxPen(GetBackgroundColour(), 1, wxSOLID));
         dc.SetBrush(wxBrush(GetBackgroundColour(),wxSOLID));
         dc.Clear();
-		return;
-	};
+        return;
+    };
 }
 
 void MaskImageCtrl::OnSize(wxSizeEvent &e)

Modified: hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-02-24 00:45:16 UTC (rev 5022)
+++ hugin/trunk/src/hugin1/hugin/PreviewLayoutLinesTool.cpp	2010-02-24 01:59:03 UTC (rev 5023)
@@ -82,6 +82,7 @@
 PreviewLayoutLinesTool::PreviewLayoutLinesTool(PreviewToolHelper *helper)
     : PreviewTool(helper),
       m_updateStatistics(true),
+      m_nearestLine(-1),
       m_useNearestLine(false)
 {
     helper->GetPanoramaPtr()->addObserver(this);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5022
          http://hugin.svn.sourceforge.net/hugin/?rev=5022&view=rev
Author:   jlegg
Date:     2010-02-24 00:45:16 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
Initalise PanoramaOptions::outputLDRExposureLayersFused to false to prevent random behviour. Found with valgrind.

Modified Paths:
--------------
    hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h

Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h	2010-02-23 23:27:45 UTC (rev 5021)
+++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h	2010-02-24 00:45:16 UTC (rev 5022)
@@ -106,8 +106,8 @@
             ORTHOGRAPHIC = 14,
             EQUISOLID = 15,
             EQUI_PANINI = 16,
-			BIPLANE = 17,
-			TRIPLANE = 18,
+            BIPLANE = 17,
+            TRIPLANE = 18,
             GENERAL_PANINI = 19
         };
 
@@ -220,6 +220,7 @@
             outputLDRLayers = false;
             outputLDRExposureRemapped = false;
             outputLDRExposureLayers = false;
+            outputLDRExposureLayersFused = false;
             outputLDRExposureBlended = false;
             outputHDRBlended = false;
             outputHDRLayers = false;
@@ -328,11 +329,11 @@
 
         /** get maximum possible hfov with current projection */
         double getMaxHFOV() const
-			{ return m_projFeatures.maxHFOV; }
+            { return m_projFeatures.maxHFOV; }
 
         /** get maximum possible vfov with current projection */
         double getMaxVFOV() const
-			{ return m_projFeatures.maxVFOV; }
+            { return m_projFeatures.maxVFOV; }
 
         ///
         DestPanoImage getDestImage() const;
@@ -409,7 +410,7 @@
         static const std::string fileformatNames[];
         static const std::string fileformatExt[];
         double m_hfov;
-		double m_vfov;
+        double m_vfov;
     //    unsigned int m_width;
     //    unsigned int m_height;
         ProjectionFormat m_projectionFormat;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.