--- /dev/null
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/ChangeLog hugin/ChangeLog
+--- hugin-0.5-beta4/ChangeLog 2005-03-08 22:23:57.000000000 +0100
++++ hugin/ChangeLog 2005-04-26 13:05:59.000000000 +0200
+@@ -1,3 +1,101 @@
++2005-04-26 13:10 dwilkins42
++
++ * src/hugin/CPEditorPanel.cpp: Fix fine tune crash
++
++2005-04-26 11:17 dwilkins42
++
++ * src/hugin/NonaStitcherPanel.cpp: Fix - do not delete multiple
++ tiff file output
++
++2005-04-26 10:22 dwilkins42
++
++ * src/hugin/: MainFrame.cpp, OptimizePanel.cpp, PanoPanel.cpp: Fix
++ infinite loops when No of images is zero
++
++2005-04-24 19:48 dwilkins42
++
++ * src/: hugin/CPEditorPanel.cpp, hugin/ImagesPanel.cpp,
++ hugin/LensPanel.cpp, hugin/OptimizePanel.cpp,
++ hugin/PanoPanel.cpp, hugin/huginApp.cpp, include/panoinc_WX.h,
++ include/common/utils.h, include/hugin/CPEditorPanel.h,
++ include/hugin/ImagesPanel.h, include/hugin/LensPanel.h,
++ include/hugin/OptimizePanel.h, include/hugin/PanoPanel.h:
++ wxWidgets 2.6 released. wxSplitterWindow etc works on wxGTK and
++ wxMSW so enable these on both platforms
++
++2005-04-23 08:58 dwilkins42
++
++ * src/hugin/NonaStitcherPanel.cpp: Ensure enblend args are passed
++ to enblend
++
++2005-04-12 19:54 ippei
++
++ * src/include/hugin/config_defaults.h: Mac: just making more
++ readable.
++
++2005-04-12 19:49 ippei
++
++ * src/hugin/NonaStitcherPanel.cpp: Mac: enblend problem fix.
++
++2005-04-12 19:48 ippei
++
++ * src/hugin/AutoCtrlPointCreator.cpp: Mac: Including customised
++ autopano frontend script inside the application bundle.
++
++2005-04-02 20:43 specu
++
++ * src/hugin/po/pl.po: updated Polish translation
++
++2005-03-30 15:03 ippei
++
++ * src/hugin/ImagesPanel.cpp: I'm sorry. I was wrong... putting it
++ back to the previous version
++
++2005-03-30 13:03 ippei
++
++ * src/hugin/NonaStitcherPanel.cpp: adding mac specific codes
++
++2005-03-30 13:01 ippei
++
++ * src/hugin/MainFrame.cpp: minor improvement for mac package bundle
++ handling
++
++2005-03-30 12:55 ippei
++
++ * src/hugin/AutoCtrlPointCreator.cpp: adding Mac specific code
++
++2005-03-30 12:54 ippei
++
++ * src/hugin/ImagesPanel.cpp: wx24 fix
++
++2005-03-30 12:48 ippei
++
++ * src/hugin/RunOptimizerFrame.cpp: adding Mac specific codes
++
++2005-03-30 12:47 ippei
++
++ * src/hugin/huginApp.cpp: minor fix in mac package bundle handling
++
++2005-03-30 12:45 ippei
++
++ * src/include/hugin/config_defaults.h: default autopano-sift
++ settings for mac
++
++2005-03-09 09:38 dangelo
++
++ * src/include/common/: math.h, platform.h: fix compilation with gcc
++ 3.4
++
++2005-03-08 23:26 dangelo
++
++ * configure.ac, src/hugin/xrc/data/about.htm,
++ src/hugin/xrc/data/about_fr.htm, src/hugin/xrc/data/about_pl.htm:
++ updated version number
++
++2005-03-08 23:23 dangelo
++
++ * ChangeLog: update changelog
++
+ 2005-03-08 22:12 dangelo
+
+ * src/hugin/ImageCenter.cpp: compile fix for wxwindows 2.4
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/AutoCtrlPointCreator.cpp hugin/src/hugin/AutoCtrlPointCreator.cpp
+--- hugin-0.5-beta4/src/hugin/AutoCtrlPointCreator.cpp 2005-03-07 21:10:43.000000000 +0100
++++ hugin/src/hugin/AutoCtrlPointCreator.cpp 2005-04-27 20:34:11.000000000 +0200
+@@ -6,7 +6,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -38,6 +38,11 @@
+ #include "hugin/AutoCtrlPointCreator.h"
+ #include "hugin/CommandHistory.h"
+
++#ifdef __WXMAC__
++#include <CFBundle.h>
++#include <wx/utils.h>
++#endif
++
+ using namespace std;
+ using namespace PT;
+ using namespace utils;
+@@ -153,19 +158,57 @@
+ return;
+ }
+ }
+-#elif defined (__WXMAC__)
+- wxString autopanoExe = wxConfigBase::Get()->Read(wxT("/AutoPanoSift/AutopanoExe"), wxT(HUGIN_APSIFT_EXE));
+- if (!wxFile::Exists(autopanoExe)){
+- wxFileDialog dlg(0,_("Select autopano-sift frontend script"),
+- "", "",
+- "Shell Scripts (*.sh)|*.sh",
+- wxOPEN, wxDefaultPosition);
+- if (dlg.ShowModal() == wxID_OK) {
+- autopanoExe = dlg.GetPath();
+- wxConfigBase::Get()->Write(wxT("/AutopanoSift/AutopanoExe"),autopanoExe);
+- } else {
+- wxLogError(_("No autopano selected"));
+- return;
++#elif (defined __WXMAC__)
++ wxString autopanoExe;
++
++ CFBundleRef mainbundle = CFBundleGetMainBundle();
++ if(!mainbundle)
++ {
++ DEBUG_INFO("Mac: Not bundled");
++ }
++ else
++ {
++ CFURLRef XRCurl = CFBundleCopyResourceURL(mainbundle, CFSTR(HUGIN_APSIFT_EXE), NULL, NULL);
++ if(!XRCurl)
++ {
++ DEBUG_INFO("Mac: Cannot locate autopano-sift frontend script in the bundle.");
++ }
++ else
++ {
++ CFIndex bufLen = 1024;
++ unsigned char buffer[(int) bufLen];
++ if(!CFURLGetFileSystemRepresentation(XRCurl, TRUE, buffer, bufLen))
++ {
++ CFRelease(XRCurl);
++ DEBUG_INFO("Mac: Failed to get file system representation");
++ }
++ else
++ {
++ buffer[((int) bufLen) - 1] = '\0';
++ CFRelease(XRCurl);
++ autopanoExe = wxString::FromAscii( (char *) buffer);
++ DEBUG_INFO("Mac: using bundled autopano-sift frontend script");
++
++ wxConfigBase::Get()->Write(wxT("/AutopanoSift/AutopanoExe"), wxT(HUGIN_APSIFT_EXE));
++ }
++ }
++ }
++
++ if(!autopanoExe)
++ {
++ autopanoExe = wxConfigBase::Get()->Read(wxT("/AutoPanoSift/AutopanoExe"), wxT(HUGIN_APSIFT_EXE));
++ if (!wxFile::Exists(autopanoExe)){
++ wxFileDialog dlg(0,_("Select autopano frontend script"),
++ wxT(""), wxT(""),
++ _("Shell Scripts (*.sh)|*.sh"),
++ wxOPEN, wxDefaultPosition);
++ if (dlg.ShowModal() == wxID_OK) {
++ autopanoExe = dlg.GetPath();
++ wxConfigBase::Get()->Write(wxT("/AutopanoSift/AutopanoExe"), autopanoExe);
++ } else {
++ wxLogError(_("No autopano selected"));
++ return;
++ }
+ }
+ }
+ #else
+@@ -238,6 +281,25 @@
+ }
+ autopanoArgs.Replace(wxT("%i"), wxString (imgFiles.c_str(), *wxConvCurrent));
+ }
++
++#ifdef __WXMAC__
++ wxString autopanoExeDir = wxConfigBase::Get()->Read(wxT("/AutoPanoSift/AutopanoExeDir"), wxT(""));
++ if (! wxFileExists( autopanoExeDir + wxT("/autopano.exe") )){
++ wxFileDialog dlg(0, _("Select autopano .Net executable."),
++ wxT(""), wxT(""),
++ wxT("Mono executables (*.exe)|*.exe"),
++ wxOPEN, wxDefaultPosition);
++ if (dlg.ShowModal() == wxID_OK) {
++ autopanoExeDir = wxPathOnly( dlg.GetPath() );
++ wxConfigBase::Get()->Write(wxT("/AutopanoSift/AutopanoExeDir"), autopanoExeDir);
++ } else {
++ wxLogError(_("No autopano directory selected"));
++ return;
++ }
++ }
++ autopanoArgs = wxT("-a ") + autopanoExeDir + wxT(" ") + autopanoArgs;
++#endif
++
+ #ifdef __WXMSW__
+ if (autopanoArgs.size() > 1930) {
+ wxMessageBox(_("autopano command line too long.\nThis is a windows limitation\nPlease select less images, or place the images in a folder with\na shorter pathname"),
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/CPEditorPanel.cpp hugin/src/hugin/CPEditorPanel.cpp
+--- hugin-0.5-beta4/src/hugin/CPEditorPanel.cpp 2005-03-07 21:10:42.000000000 +0100
++++ hugin/src/hugin/CPEditorPanel.cpp 2005-04-26 12:10:32.000000000 +0200
+@@ -6,7 +6,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -174,7 +174,7 @@
+ m_estimateCB = XRCCTRL(*this,"cp_editor_auto_estimate", wxCheckBox);
+ DEBUG_ASSERT(m_estimateCB);
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ m_cp_ctrls = XRCCTRL(*this, "cp_controls_panel", wxScrolledWindow);
+ DEBUG_ASSERT(m_cp_ctrls);
+ m_cp_splitter = XRCCTRL(*this, "cp_editor_panel_splitter", wxSplitterWindow);
+@@ -183,8 +183,7 @@
+ m_cp_ctrls->SetSizeHints(20, 20);
+ m_cp_ctrls->FitInside();
+ m_cp_ctrls->SetScrollRate(10, 10);
+- // wx 2.5.4
+- // m_cp_splitter->SetSashGravity(0.5);
++ m_cp_splitter->SetSashGravity(0.5);
+ m_cp_splitter->SetSashPosition(wxConfigBase::Get()->Read(wxT("/CPEditorPanel/sashPos"),200));
+ m_cp_splitter->SetMinimumPaneSize(20);
+ #endif
+@@ -210,7 +209,7 @@
+ {
+ DEBUG_TRACE("dtor");
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ int sashPos;
+ sashPos = m_cp_splitter->GetSashPosition();
+ DEBUG_INFO("CP Editor panel sash pos: " << sashPos);
+@@ -1683,7 +1682,7 @@
+ {
+ if (cpCreationState == NO_POINT) {
+ FineTuneSelectedPoint(false);
+- } else if (BOTH_POINTS_SELECTED) {
++ } else if (cpCreationState == BOTH_POINTS_SELECTED) {
+ FineTuneNewPoint(false);
+ }
+ }
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/huginApp.cpp hugin/src/hugin/huginApp.cpp
+--- hugin-0.5-beta4/src/hugin/huginApp.cpp 2005-02-22 11:08:54.000000000 +0100
++++ hugin/src/hugin/huginApp.cpp 2005-04-24 18:48:11.000000000 +0200
+@@ -6,7 +6,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -174,7 +174,7 @@
+ else
+ {
+ CFIndex bufLen = 1024;
+- unsigned char buffer[1024];
++ unsigned char buffer[(int) bufLen];
+ if(!CFURLGetFileSystemRepresentation(XRCurl, TRUE, buffer, bufLen))
+ {
+ CFRelease(XRCurl);
+@@ -182,10 +182,11 @@
+ }
+ else
+ {
+- buffer[1023] = '\0';
++ buffer[((int) bufLen) - 1] = '\0';
+ CFRelease(XRCurl);
+- xrcPrefix = (wxString)buffer+ wxT("/");
++ xrcPrefix = wxString::FromAscii( (char *) buffer) + wxT("/");
+ DEBUG_INFO("Mac: overriding xrc prefix; using mac bundled xrc files");
++
+ }
+ }
+ }
+@@ -209,7 +210,7 @@
+ wxXmlResource::Get()->Load(xrcPrefix + wxT("help.xrc"));
+ wxXmlResource::Get()->Load(xrcPrefix + wxT("keyboard_help.xrc"));
+ wxXmlResource::Get()->Load(xrcPrefix + wxT("pref_dialog.xrc"));
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ wxXmlResource::Get()->Load(xrcPrefix + wxT("cp_editor_panel-2.5.xrc"));
+ wxXmlResource::Get()->Load(xrcPrefix + wxT("images_panel-2.5.xrc"));
+ wxXmlResource::Get()->Load(xrcPrefix + wxT("lens_panel-2.5.xrc"));
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/ImagesPanel.cpp hugin/src/hugin/ImagesPanel.cpp
+--- hugin-0.5-beta4/src/hugin/ImagesPanel.cpp 2005-02-22 11:08:10.000000000 +0100
++++ hugin/src/hugin/ImagesPanel.cpp 2005-04-24 18:48:09.000000000 +0200
+@@ -7,7 +7,7 @@
+ * @author Kai-Uwe Behrmann <web@tiscali.de> and
+ * Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -60,7 +60,7 @@
+ EVT_SIZE ( ImagesPanel::FitParent )
+ // EVT_MOUSE_EVENTS ( ImagesPanel::OnMouse )
+ // EVT_MOTION ( ImagesPanel::ChangePreview )
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ EVT_SPLITTER_SASH_POS_CHANGED(XRCID("image_panel_splitter"), ImagesPanel::OnPositionChanged)
+ #endif
+ EVT_LIST_ITEM_SELECTED( XRCID("images_list_unknown"),
+@@ -107,7 +107,7 @@
+ m_removeCPButton = XRCCTRL(*this, "images_remove_cp", wxButton);
+ DEBUG_ASSERT(m_removeCPButton);
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ m_img_ctrls = XRCCTRL(*this, "image_control_panel", wxScrolledWindow);
+ DEBUG_ASSERT(m_img_ctrls);
+ m_img_splitter = XRCCTRL(*this, "image_panel_splitter", wxSplitterWindow);
+@@ -118,8 +118,7 @@
+ {
+ int sashPos;
+ sashPos = wxConfigBase::Get()->Read(wxT("/ImageFrame/sashPos"),300);
+- // wx 2.5.4
+- //m_img_splitter->SetSashGravity(0.5);
++ m_img_splitter->SetSashGravity(0.5);
+ m_img_splitter->SetSashPosition(sashPos);
+ }
+ m_img_splitter->SetMinimumPaneSize(20);
+@@ -152,7 +151,7 @@
+ {
+ DEBUG_TRACE("dtor");
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ int sashPos;
+ sashPos = m_img_splitter->GetSashPosition();
+ DEBUG_INFO("Image panel sash pos: " << sashPos);
+@@ -173,7 +172,7 @@
+
+ void ImagesPanel::FitParent( wxSizeEvent & e )
+ {
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ int winWidth, winHeight;
+ GetClientSize(&winWidth, &winHeight);
+ // winHeight -= ConvertDialogToPixels(wxPoint(0, 30)).y; // sizes of tabs and toolbar
+@@ -190,7 +189,7 @@
+ #endif
+ }
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ void ImagesPanel::OnPositionChanged(wxSplitterEvent& event)
+ {
+ DEBUG_INFO("Sash Position now:" << event.GetSashPosition() << " or: " << m_img_splitter->GetSashPosition());
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/LensPanel.cpp hugin/src/hugin/LensPanel.cpp
+--- hugin-0.5-beta4/src/hugin/LensPanel.cpp 2005-03-08 21:17:27.000000000 +0100
++++ hugin/src/hugin/LensPanel.cpp 2005-04-24 18:48:10.000000000 +0200
+@@ -9,7 +9,7 @@
+ *
+ * Rewritten by Pablo d'Angelo
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -134,7 +134,7 @@
+ m_pixelDigits = wxConfigBase::Get()->Read(wxT("/General/PixelFractionalDigitsEdit"),2);
+ m_distDigitsEdit = wxConfigBase::Get()->Read(wxT("/General/DistortionFractionalDigitsEdit"),5);
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ m_lens_ctrls = XRCCTRL(*this, "lens_control_panel", wxScrolledWindow);
+ DEBUG_ASSERT(m_lens_ctrls);
+ m_lens_splitter = XRCCTRL(*this, "lens_panel_splitter", wxSplitterWindow);
+@@ -143,6 +143,7 @@
+ m_lens_ctrls->FitInside();
+ m_lens_ctrls->SetScrollRate(10, 10);
+ m_lens_splitter->SetSashPosition(wxConfigBase::Get()->Read(wxT("/LensFrame/sashPos"),300));
++ m_lens_splitter->SetSashGravity(0.5);
+ m_lens_splitter->SetMinimumPaneSize(20);
+ #endif
+
+@@ -157,7 +158,7 @@
+ {
+ DEBUG_TRACE("dtor");
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ int sashPos;
+ sashPos = m_lens_splitter->GetSashPosition();
+ DEBUG_INFO("Lens panel sash pos: " << sashPos);
+@@ -182,7 +183,7 @@
+
+ void LensPanel::FitParent( wxSizeEvent & e )
+ {
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ int winWidth, winHeight;
+ GetClientSize(&winWidth, &winHeight);
+ // winHeight -= ConvertDialogToPixels(wxPoint(0, 30)).y; // sizes of tabs and toolbar
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/MainFrame.cpp hugin/src/hugin/MainFrame.cpp
+--- hugin-0.5-beta4/src/hugin/MainFrame.cpp 2005-03-07 21:10:42.000000000 +0100
++++ hugin/src/hugin/MainFrame.cpp 2005-04-26 09:22:34.000000000 +0200
+@@ -6,7 +6,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -207,7 +207,7 @@
+ else
+ {
+ CFIndex bufLen = 1024;
+- unsigned char buffer[1024];
++ unsigned char buffer[(int) bufLen];
+ if(!CFURLGetFileSystemRepresentation(XRCurl, TRUE, buffer, bufLen))
+ {
+ CFRelease(XRCurl);
+@@ -215,9 +215,9 @@
+ }
+ else
+ {
+- buffer[1023] = '\0';
++ buffer[((int) bufLen) - 1] = '\0';
+ CFRelease(XRCurl);
+- m_xrcPrefix = (wxString)buffer+ wxT("/");
++ m_xrcPrefix = wxString::FromAscii( (char *) buffer) + wxT("/");
+ DEBUG_INFO("Mac: overriding xrc prefix; using mac bundled xrc files");
+ }
+ }
+@@ -472,6 +472,10 @@
+ void MainFrame::OnSaveProject(wxCommandEvent & e)
+ {
+ DEBUG_TRACE("");
++ if (pano.getNrOfImages() == 0) {
++ wxMessageBox(_("No images - Nothing to do"),_("Warning"), wxOK | wxICON_EXCLAMATION);
++ return;
++ }
+ wxFileName scriptName = m_filename;
+ if (m_filename == wxT("")) {
+ OnSaveProjectAs(e);
+@@ -496,6 +500,10 @@
+ void MainFrame::OnSaveProjectAs(wxCommandEvent & e)
+ {
+ DEBUG_TRACE("");
++ if (pano.getNrOfImages() == 0) {
++ wxMessageBox(_("No images - Nothing to do"),_("Warning"), wxOK | wxICON_EXCLAMATION);
++ return;
++ }
+ wxFileDialog dlg(this,
+ _("Save project file"),
+ wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), wxT(""),
+@@ -511,6 +519,10 @@
+ void MainFrame::OnSavePTStitcherAs(wxCommandEvent & e)
+ {
+ DEBUG_TRACE("");
++ if (pano.getNrOfImages() == 0) {
++ wxMessageBox(_("No images - Nothing to do"),_("Warning"), wxOK | wxICON_EXCLAMATION);
++ return;
++ }
+ wxFileDialog dlg(this,
+ _("Save PTStitcher script file"),
+ wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), wxT(""),
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/NonaStitcherPanel.cpp hugin/src/hugin/NonaStitcherPanel.cpp
+--- hugin-0.5-beta4/src/hugin/NonaStitcherPanel.cpp 2005-03-08 21:17:26.000000000 +0100
++++ hugin/src/hugin/NonaStitcherPanel.cpp 2005-04-26 10:17:12.000000000 +0200
+@@ -7,7 +7,7 @@
+ * @author Kai-Uwe Behrmann <web@tiscali.de> and
+ * Pablo d'Angelo <pablo@mathematik.uni-ulm.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -302,7 +302,7 @@
+ wxLogError(_("No enblend.exe selected"));
+ }
+ }
+-#elif defined (__WXMAC__)
++#elif defined __WXMAC__
+ wxString enblendExe = config->Read(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
+ if (!wxFile::Exists(enblendExe)){
+ wxFileDialog dlg(this,_("Select enblend commandline tool"),
+@@ -314,6 +314,7 @@
+ config->Write(wxT("/Enblend/EnblendExe"),enblendExe);
+ } else {
+ wxLogError(_("No enblend commandline tool selected"));
++ return;
+ }
+ }
+ #else
+@@ -324,6 +325,7 @@
+ // spaces
+
+ wxString args;
++ args.append(config->Read(wxT("/Enblend/EnblendArgs"), wxT(HUGIN_ENBLEND_ARGS)));
+ if (opts.HFOV == 360.0) {
+ // blend over the border
+ args.append(wxT(" -w"));
+@@ -351,8 +353,10 @@
+ #endif
+ {
+ wxProgressDialog progress(_("Running Enblend"),_("Enblend will take a while to finish processing the panorama\nYou can watch the enblend progress in the command window"));
++
++ wxString cmdline;
+ #ifdef unix
+- wxString cmdline = enblendExe + wxT(" ") + args;
++ cmdline = enblendExe + wxT(" ") + args;
+ DEBUG_DEBUG("using system() to execute enblend with cmdline:" << cmdline.mb_str());
+ int ret = system(cmdline.mb_str());
+ if (ret == -1) {
+@@ -362,7 +366,7 @@
+ ret = WEXITSTATUS(ret);
+ }
+ #elif __WXMSW__
+- wxString cmdline = wxString(wxT("enblend.exe ")) + args;
++ cmdline = wxString(wxT("enblend.exe ")) + args;
+ // using CreateProcess on windows
+ /* CreateProcess API initialization */
+ STARTUPINFO siStartupInfo;
+@@ -388,7 +392,8 @@
+ wxLogError(_("Could not execute command: ") + cmdline , _("CreateProcess Error"));
+ }
+ #else
+- int ret = wxExecute(args, wxEXEC_SYNC);
++ cmdline = enblendExe + wxT(" ") + args;
++ int ret = wxExecute(cmdline, wxEXEC_SYNC);
+ #endif
+ DEBUG_NOTICE("enblend returned with: " << ret);
+
+@@ -403,8 +408,8 @@
+ }
+ }
+ }
+- if (wxConfigBase::Get()->Read(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES) != 0) {
+- // delete remapped tiff files
++ if ((wxConfigBase::Get()->Read(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES) != 0) && enblend) {
++ // delete remapped tiff files only if enblend was used for the stitching
+ for (UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); ++it)
+ {
+ wxString f = output + wxString::Format(wxT("%04d.tif"), *it);
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/OptimizePanel.cpp hugin/src/hugin/OptimizePanel.cpp
+--- hugin-0.5-beta4/src/hugin/OptimizePanel.cpp 2005-03-07 21:10:42.000000000 +0100
++++ hugin/src/hugin/OptimizePanel.cpp 2005-04-26 09:22:35.000000000 +0200
+@@ -6,7 +6,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -89,7 +89,7 @@
+ m_mode_cb = XRCCTRL(*this, "optimize_panel_mode", wxChoice);
+ DEBUG_ASSERT(m_mode_cb);
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ m_opt_ctrls = XRCCTRL(*this, "optimize_controls_panel", wxScrolledWindow);
+ DEBUG_ASSERT(m_opt_ctrls);
+ m_opt_ctrls->SetSizeHints(20, 20);
+@@ -422,6 +422,7 @@
+ DEBUG_TRACE("");
+ if (m_pano->getNrOfImages() == 0) {
+ // nothing to optimize
++ wxMessageBox(_("No images - Nothing to do"),_("Warning"), wxOK | wxICON_EXCLAMATION);
+ return;
+ }
+
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/PanoPanel.cpp hugin/src/hugin/PanoPanel.cpp
+--- hugin-0.5-beta4/src/hugin/PanoPanel.cpp 2005-02-22 11:08:43.000000000 +0100
++++ hugin/src/hugin/PanoPanel.cpp 2005-04-26 09:22:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ * @author Kai-Uwe Behrmann <web@tiscali.de> and
+ * Pablo d'Angelo <pablo@mathematik.uni-ulm.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -109,7 +109,7 @@
+ m_StitchButton = XRCCTRL(*this, "pano_button_stitch", wxButton);
+ DEBUG_ASSERT(m_StitchButton);
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ m_pano_ctrls = XRCCTRL(*this, "pano_controls_panel", wxScrolledWindow);
+ DEBUG_ASSERT(m_pano_ctrls);
+ m_pano_ctrls->SetSizeHints(20, 20);
+@@ -437,7 +437,7 @@
+ m_Stitcher );
+ // redo layout.
+ // Layout();
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ m_pano_ctrls->FitInside();
+ #endif
+ }
+@@ -491,6 +491,10 @@
+
+ void PanoPanel::DoStitch ( wxCommandEvent & e )
+ {
++ if (pano.getNrOfImages() == 0) {
++ wxMessageBox(_("No images - Nothing to do"),_("Warning"), wxOK | wxICON_EXCLAMATION);
++ return;
++ }
+ int preset = m_QuickChoice->GetSelection();
+ // apply preset mode. (recalculates width etc)
+ ApplyQuickMode(preset);
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/po/de.po hugin/src/hugin/po/de.po
+--- hugin-0.5-beta4/src/hugin/po/de.po 2005-03-08 22:10:47.000000000 +0100
++++ hugin/src/hugin/po/de.po 2005-04-26 13:06:00.000000000 +0200
+@@ -10,7 +10,7 @@
+ msgstr ""
+ "Project-Id-Version: de\n"
+ "Report-Msgid-Bugs-To: pablo.dangelo@web.de\n"
+-"POT-Creation-Date: 2005-03-08 21:37+0100\n"
++"POT-Creation-Date: 2005-04-26 12:54+0300\n"
+ "PO-Revision-Date: 2005-03-08 22:02+0100\n"
+ "Last-Translator: Pablo d'Angelo <pablo.dangelo@mathematik.uni-ulm.de>\n"
+ "Language-Team: deutsch <de@li.org>\n"
+@@ -22,73 +22,89 @@
+ "X-Poedit-Basepath: /home/pablo/src/my/hugin-0.4\n"
+ "X-Poedit-SearchPath-0: /home/pablo/src/my/hugin-0.4\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ #, c-format
+ msgid "Added %d control points"
+ msgstr "%d Kontrollpunkte hinzugefügt"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ msgid "Autopano result"
+ msgstr "Autopano Ergebnisse"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:102
++#: src/hugin/AutoCtrlPointCreator.cpp:107
+ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+ msgstr "Autopano (Version 1.03 oder höher) ,von http://autopano.kolor.com"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:103
++#: src/hugin/AutoCtrlPointCreator.cpp:108
+ msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+ msgstr "Autopano-Sift, von http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Choose which autopano program should be used\n"
+ msgstr "Wählen sie welches Autopano Programm sie verwenden wollen\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Select autopano type"
+ msgstr "Wählen sie den Autopano Typ"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:144
+-#: src/hugin/AutoCtrlPointCreator.cpp:331
++#: src/hugin/AutoCtrlPointCreator.cpp:149
++#: src/hugin/AutoCtrlPointCreator.cpp:393
+ msgid "Select autopano program / frontend script"
+ msgstr "Wählen sie das Autopano Programm / Oberflächenskript"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:146
+-#: src/hugin/PreferencesDialog.cpp:175
+-#: src/hugin/PreferencesDialog.cpp:191
+-#: src/hugin/PreferencesDialog.cpp:207
+-#: src/hugin/PreferencesDialog.cpp:223
+-#: src/hugin/RunOptimizerFrame.cpp:110
++#: src/hugin/AutoCtrlPointCreator.cpp:151 src/hugin/PreferencesDialog.cpp:175
++#: src/hugin/PreferencesDialog.cpp:191 src/hugin/PreferencesDialog.cpp:207
++#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:111
+ #: src/hugin/RunStitcherFrame.cpp:89
+ msgid "Executables (*.exe)|*.exe"
+ msgstr "Ausführbar (*.exe)|*.exe"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:152
+-#: src/hugin/AutoCtrlPointCreator.cpp:167
+-#: src/hugin/AutoCtrlPointCreator.cpp:339
++#: src/hugin/AutoCtrlPointCreator.cpp:157
++#: src/hugin/AutoCtrlPointCreator.cpp:209
++#: src/hugin/AutoCtrlPointCreator.cpp:401
+ msgid "No autopano selected"
+ msgstr "Kein Autopano Programm ausgewählt"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:159
+-msgid "Select autopano-sift frontend script"
++#: src/hugin/AutoCtrlPointCreator.cpp:201
++#, fuzzy
++msgid "Select autopano frontend script"
+ msgstr "Autopano-Sift auswählen"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:205
++#: src/hugin/AutoCtrlPointCreator.cpp:203
++msgid "Shell Scripts (*.sh)|*.sh"
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:248
+ #, c-format
+ msgid "Please use either %namefile or %i in the autopano-sift command line."
+-msgstr "Bitte benutzen sie entweder %namefile oder %i in der Autopano-Sift Kommandozeile"
++msgstr ""
++"Bitte benutzen sie entweder %namefile oder %i in der Autopano-Sift "
++"Kommandozeile"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:206
+-#: src/hugin/AutoCtrlPointCreator.cpp:211
++#: src/hugin/AutoCtrlPointCreator.cpp:249
++#: src/hugin/AutoCtrlPointCreator.cpp:254
+ msgid "Error in Autopano command"
+ msgstr "Fehler im Autopano Kommando"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:210
++#: src/hugin/AutoCtrlPointCreator.cpp:253
+ #, c-format
+-msgid "Please use %namefile or %i to specify the input files for autopano-sift"
+-msgstr "Bitte benutzen sie %namefile oder %i für die Eingabedatei von Autopano-Sift"
++msgid ""
++"Please use %namefile or %i to specify the input files for autopano-sift"
++msgstr ""
++"Bitte benutzen sie %namefile oder %i für die Eingabedatei von Autopano-Sift"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:288
++#, fuzzy
++msgid "Select autopano .Net executable."
++msgstr "Wählen sie den Autopano Typ"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:243
+-#: src/hugin/AutoCtrlPointCreator.cpp:377
++#: src/hugin/AutoCtrlPointCreator.cpp:297
++#, fuzzy
++msgid "No autopano directory selected"
++msgstr "Kein Autopano Programm ausgewählt"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:305
++#: src/hugin/AutoCtrlPointCreator.cpp:439
+ msgid ""
+ "autopano command line too long.\n"
+ "This is a windows limitation\n"
+@@ -100,19 +116,18 @@
+ "Bitte wählen sie weniger Bilder oder plazieren sie die Bilder in einem\n"
+ "Ordner mit einem kürzeren Pfadnamen"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:244
+-#: src/hugin/AutoCtrlPointCreator.cpp:378
+-#: src/hugin/NonaStitcherPanel.cpp:348
++#: src/hugin/AutoCtrlPointCreator.cpp:306
++#: src/hugin/AutoCtrlPointCreator.cpp:440 src/hugin/NonaStitcherPanel.cpp:350
+ msgid "Too many images selected"
+ msgstr "Zu viele Bilder ausgewählt"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid "Running autopano"
+ msgstr "Starte Autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid ""
+ "Please wait while autopano searches control points\n"
+ "See the command window for autopanos' progress"
+@@ -120,35 +135,31 @@
+ "Bitte warten sie, während Autopano die Kontrollpunkte sucht\n"
+ "Der Fortschritt kann im Kommando Fenster beobachtet werden."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:400
+-#: src/hugin/NonaStitcherPanel.cpp:388
+-#: src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:344
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:462 src/hugin/NonaStitcherPanel.cpp:392
++#: src/hugin/NonaStitcherPanel.cpp:401
+ msgid "Could not execute command: "
+ msgstr "Kann den Befehl nicht ausführen:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
++#: src/hugin/AutoCtrlPointCreator.cpp:344
+ msgid "ShellExecuteEx failed"
+ msgstr "ShellExecuteEx fehlgeschlagen"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:300
+-#: src/hugin/AutoCtrlPointCreator.cpp:400
+-#: src/hugin/AutoCtrlPointCreator.cpp:406
+-#: src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:362
++#: src/hugin/AutoCtrlPointCreator.cpp:462
++#: src/hugin/AutoCtrlPointCreator.cpp:468 src/hugin/NonaStitcherPanel.cpp:401
+ msgid "wxExecute Error"
+ msgstr "wxExecute Error, externes Programm kann nicht ausgeführt werden"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:298
+-#: src/hugin/AutoCtrlPointCreator.cpp:404
+-#: src/hugin/NonaStitcherPanel.cpp:399
++#: src/hugin/AutoCtrlPointCreator.cpp:360
++#: src/hugin/AutoCtrlPointCreator.cpp:466 src/hugin/NonaStitcherPanel.cpp:404
+ msgid "command: "
+ msgstr "Kommando:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:299
+-#: src/hugin/AutoCtrlPointCreator.cpp:405
+-#: src/hugin/NonaStitcherPanel.cpp:400
++#: src/hugin/AutoCtrlPointCreator.cpp:361
++#: src/hugin/AutoCtrlPointCreator.cpp:467 src/hugin/NonaStitcherPanel.cpp:405
+ msgid ""
+ "\n"
+ "failed with error code: "
+@@ -156,13 +167,13 @@
+ "\n"
+ "Fehlgeschlagen mit Fehlerkode:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid "Could not open "
+ msgstr "Konnte nicht öffnen"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid ""
+ " for reading\n"
+ "This is an indicator that the autopano call failed,\n"
+@@ -176,17 +187,16 @@
+ "\n"
+ "Autopano Kommando:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:307
+-#: src/hugin/AutoCtrlPointCreator.cpp:416
++#: src/hugin/AutoCtrlPointCreator.cpp:369
++#: src/hugin/AutoCtrlPointCreator.cpp:478
+ msgid "autopano failure"
+ msgstr "Autopano Fehler"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:333
+-#: src/hugin/PreferencesDialog.cpp:239
++#: src/hugin/AutoCtrlPointCreator.cpp:395 src/hugin/PreferencesDialog.cpp:239
+ msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+ msgstr "Ausführbare (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:414
++#: src/hugin/AutoCtrlPointCreator.cpp:476
+ msgid ""
+ "\n"
+ " current directory:"
+@@ -202,10 +212,8 @@
+ msgid "no command in redo history"
+ msgstr "Kein Kommando im Wiederherstellenprotokoll"
+
+-#: src/hugin/CPEditorPanel.cpp:146
+-#: src/hugin/CPListFrame.cpp:276
+-#: src/hugin/CPListFrame.cpp:286
+-#: src/hugin/ImagesList.cpp:52
++#: src/hugin/CPEditorPanel.cpp:146 src/hugin/CPListFrame.cpp:276
++#: src/hugin/CPListFrame.cpp:286 src/hugin/ImagesList.cpp:52
+ msgid "#"
+ msgstr "#"
+
+@@ -225,46 +233,46 @@
+ msgid "right y"
+ msgstr "y rechts"
+
+-#: src/hugin/CPEditorPanel.cpp:151
+-#: src/hugin/CPListFrame.cpp:283
++#: src/hugin/CPEditorPanel.cpp:151 src/hugin/CPListFrame.cpp:283
+ #: src/hugin/CPListFrame.cpp:289
+ msgid "Alignment"
+ msgstr "Ausrichtung"
+
+-#: src/hugin/CPEditorPanel.cpp:152
+-#: src/hugin/CPListFrame.cpp:284
++#: src/hugin/CPEditorPanel.cpp:152 src/hugin/CPListFrame.cpp:284
+ #: src/hugin/CPListFrame.cpp:290
+ msgid "Distance"
+ msgstr "Abstand"
+
+-#: src/hugin/CPEditorPanel.cpp:406
++#: src/hugin/CPEditorPanel.cpp:405
+ msgid "No corresponding point found"
+ msgstr "Kein korrespondierender Punkt gefunden"
+
+-#: src/hugin/CPEditorPanel.cpp:475
++#: src/hugin/CPEditorPanel.cpp:474
+ msgid "new control point added"
+ msgstr "Neuer Kontrollpunkt hinzugefügt"
+
+-#: src/hugin/CPEditorPanel.cpp:575
+-#: src/hugin/CPEditorPanel.cpp:781
++#: src/hugin/CPEditorPanel.cpp:574 src/hugin/CPEditorPanel.cpp:780
+ msgid "searching similar point..."
+ msgstr "Suche ähnlichen Punkt..."
+
+-#: src/hugin/CPEditorPanel.cpp:594
+-#: src/hugin/CPEditorPanel.cpp:709
++#: src/hugin/CPEditorPanel.cpp:593 src/hugin/CPEditorPanel.cpp:708
+ msgid "Error during Fine-tune"
+ msgstr "Fehler während der Feinabstimmung"
+
+-#: src/hugin/CPEditorPanel.cpp:625
++#: src/hugin/CPEditorPanel.cpp:624
+ msgid "Estimated point outside image"
+ msgstr "Geschätzter Punkt außerhalb des Bildes"
+
+-#: src/hugin/CPEditorPanel.cpp:827
++#: src/hugin/CPEditorPanel.cpp:826
+ #, c-format
+-msgid "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: %0.3f %0.3f "
+-msgstr "Punkt verfeinert, Winkel: %.0f °, Korrelationskoeffizient: %0.3f, Krümmung: %0.3f %0.3f "
++msgid ""
++"Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
++"%0.3f %0.3f "
++msgstr ""
++"Punkt verfeinert, Winkel: %.0f °, Korrelationskoeffizient: %0.3f, Krümmung: %"
++"0.3f %0.3f "
+
+-#: src/hugin/CPEditorPanel.cpp:833
++#: src/hugin/CPEditorPanel.cpp:832
+ #, c-format
+ msgid ""
+ "No similar point found.\n"
+@@ -275,40 +283,36 @@
+ "Korrelationskoeffizient: %.3f (sollte > %.3f)\n"
+ "Größte Krümmung: (%.3f, %.3f) ( sollte > %.3f)"
+
+-#: src/hugin/CPEditorPanel.cpp:835
++#: src/hugin/CPEditorPanel.cpp:834
+ msgid "No similar point found"
+ msgstr "Keinen ähnlichen Punkt gefunden"
+
+-#: src/hugin/CPEditorPanel.cpp:1151
+-#: src/hugin/CPListFrame.cpp:402
+-#: src/hugin/PreviewFrame.cpp:156
+-#: src/hugin/xrc/cp_editor_panel.xrs:24
++#: src/hugin/CPEditorPanel.cpp:1150 src/hugin/CPListFrame.cpp:402
++#: src/hugin/PreviewFrame.cpp:156 src/hugin/xrc/cp_editor_panel.xrs:24
+ msgid "normal"
+ msgstr "normal"
+
+-#: src/hugin/CPEditorPanel.cpp:1154
+-#: src/hugin/CPListFrame.cpp:405
++#: src/hugin/CPEditorPanel.cpp:1153 src/hugin/CPListFrame.cpp:405
+ msgid "vert. Line"
+ msgstr "vert. Linie"
+
+-#: src/hugin/CPEditorPanel.cpp:1157
+-#: src/hugin/CPListFrame.cpp:408
++#: src/hugin/CPEditorPanel.cpp:1156 src/hugin/CPListFrame.cpp:408
+ msgid "horiz. Line"
+ msgstr "horiz. Linie"
+
+-#: src/hugin/CPEditorPanel.cpp:1412
++#: src/hugin/CPEditorPanel.cpp:1411
+ msgid "Cannot estimate image position without control points"
+ msgstr "Bildposition kann ohne Kontrollpunkte nicht geschätzt werden"
+
+-#: src/hugin/CPEditorPanel.cpp:1603
++#: src/hugin/CPEditorPanel.cpp:1602
+ msgid "Select Point in right image"
+ msgstr "Punkt im rechten Bild wählen"
+
+-#: src/hugin/CPEditorPanel.cpp:1615
++#: src/hugin/CPEditorPanel.cpp:1614
+ msgid "Select Point in left image"
+ msgstr "Punkt im linken Bild wählen"
+
+-#: src/hugin/CPEditorPanel.cpp:1634
++#: src/hugin/CPEditorPanel.cpp:1633
+ msgid "change points, or press right mouse button to add the pair"
+ msgstr "Punkte wechseln oder mit der rechten Maustaste ein Paar hinzufügen"
+
+@@ -320,28 +324,23 @@
+ msgid "Could not process event!"
+ msgstr "Interner Fehler: Konnte Ereignis nicht verarbeiten"
+
+-#: src/hugin/CPListFrame.cpp:277
+-#: src/hugin/CPListFrame.cpp:287
++#: src/hugin/CPListFrame.cpp:277 src/hugin/CPListFrame.cpp:287
+ msgid "left Img."
+ msgstr "linkes Bild"
+
+-#: src/hugin/CPListFrame.cpp:278
+-#: src/hugin/CPListFrame.cpp:281
++#: src/hugin/CPListFrame.cpp:278 src/hugin/CPListFrame.cpp:281
+ msgid "x"
+ msgstr "x"
+
+-#: src/hugin/CPListFrame.cpp:279
+-#: src/hugin/CPListFrame.cpp:282
++#: src/hugin/CPListFrame.cpp:279 src/hugin/CPListFrame.cpp:282
+ msgid "y"
+ msgstr "y"
+
+-#: src/hugin/CPListFrame.cpp:280
+-#: src/hugin/CPListFrame.cpp:288
++#: src/hugin/CPListFrame.cpp:280 src/hugin/CPListFrame.cpp:288
+ msgid "right Img."
+ msgstr "rechtes Bild"
+
+-#: src/hugin/CPListFrame.cpp:605
+-#: src/hugin/CPListFrame.cpp:614
++#: src/hugin/CPListFrame.cpp:605 src/hugin/CPListFrame.cpp:614
+ msgid ""
+ "Enter minimum control point error.\n"
+ "All point with a higher error will be selected"
+@@ -349,8 +348,7 @@
+ "Kleinster zulässiger Kontrollpunktfehler eingeben\n"
+ "Alle Punkte mit höherem Fehler werden ausgewählt"
+
+-#: src/hugin/CPListFrame.cpp:605
+-#: src/hugin/CPListFrame.cpp:614
++#: src/hugin/CPListFrame.cpp:605 src/hugin/CPListFrame.cpp:614
+ msgid "Select Control Points"
+ msgstr "Kontrollpunkte auswählen"
+
+@@ -406,8 +404,7 @@
+ msgid "Bottom:"
+ msgstr "Unten:"
+
+-#: src/hugin/ImageCenter.cpp:100
+-#: src/hugin/xrc/images_panel.xrs:31
++#: src/hugin/ImageCenter.cpp:100 src/hugin/xrc/images_panel.xrs:31
+ msgid "Reset"
+ msgstr "Zurücksetzen"
+
+@@ -415,10 +412,17 @@
+ msgid "Always center Crop on d,e"
+ msgstr "Zuschnitt immer auf d,e zentrieren."
+
+-#: src/hugin/ImageCenter.cpp:207
+-#: src/hugin/ImageCenter.cpp:222
+-#: src/hugin/ImageCenter.cpp:237
+-#: src/hugin/ImageCenter.cpp:252
++#: src/hugin/ImageCenter.cpp:105 src/hugin/xrc/pref_dialog.xrs:68
++msgid "Ok"
++msgstr "Ok"
++
++#: src/hugin/ImageCenter.cpp:110 src/hugin/RunOptimizerFrame.cpp:310
++#: src/hugin/xrc/edit_text.xrs:3 src/hugin/xrc/pref_dialog.xrs:70
++msgid "Cancel"
++msgstr "Abbrechen"
++
++#: src/hugin/ImageCenter.cpp:207 src/hugin/ImageCenter.cpp:222
++#: src/hugin/ImageCenter.cpp:237 src/hugin/ImageCenter.cpp:252
+ msgid "Please enter a valid number"
+ msgstr "Bitte eine Nummer eingeben"
+
+@@ -427,8 +431,7 @@
+ msgid "Yaw: %.1f Pitch:%.1f Roll:%.1f"
+ msgstr "Yaw: %.1f Neigung:%.1f Rollen:%.1f"
+
+-#: src/hugin/ImagesList.cpp:232
+-#: src/hugin/ImagesList.cpp:280
++#: src/hugin/ImagesList.cpp:232 src/hugin/ImagesList.cpp:280
+ msgid "Filename"
+ msgstr "Dateiname"
+
+@@ -504,86 +507,76 @@
+ msgid "Crop"
+ msgstr "Crop"
+
+-#: src/hugin/ImagesList.cpp:305
+-#: src/hugin/xrc/lens_panel.xrs:2
++#: src/hugin/ImagesList.cpp:305 src/hugin/xrc/lens_panel.xrs:2
+ msgid "Normal (rectilinear)"
+ msgstr "Normal (rectilinear)"
+
+-#: src/hugin/ImagesList.cpp:306
+-#: src/hugin/xrc/lens_panel.xrs:3
++#: src/hugin/ImagesList.cpp:306 src/hugin/xrc/lens_panel.xrs:3
+ msgid "Panoramic (cylindrical)"
+ msgstr "Zylindrisch"
+
+-#: src/hugin/ImagesList.cpp:307
+-#: src/hugin/xrc/lens_panel.xrs:4
++#: src/hugin/ImagesList.cpp:307 src/hugin/xrc/lens_panel.xrs:4
+ msgid "Circular fisheye"
+ msgstr "Fischauge kreisförmig"
+
+-#: src/hugin/ImagesList.cpp:308
+-#: src/hugin/xrc/lens_panel.xrs:5
++#: src/hugin/ImagesList.cpp:308 src/hugin/xrc/lens_panel.xrs:5
+ msgid "Full frame fisheye"
+ msgstr "Fischauge Vollbild"
+
+-#: src/hugin/ImagesList.cpp:309
+-#: src/hugin/PanoPanel.cpp:195
+-#: src/hugin/PreviewFrame.cpp:413
+-#: src/hugin/xrc/lens_panel.xrs:6
++#: src/hugin/ImagesList.cpp:309 src/hugin/PanoPanel.cpp:195
++#: src/hugin/PreviewFrame.cpp:413 src/hugin/xrc/lens_panel.xrs:6
+ msgid "Equirectangular"
+ msgstr "Sphärisch (equirectangular)"
+
+-#: src/hugin/ImagesPanel.cpp:271
+-#: src/hugin/ImagesPanel.cpp:292
+-#: src/hugin/ImagesPanel.cpp:312
++#: src/hugin/ImagesPanel.cpp:270 src/hugin/ImagesPanel.cpp:291
++#: src/hugin/ImagesPanel.cpp:311
+ msgid "Value must be numeric."
+ msgstr "Wert muß numerisch sein"
+
+-#: src/hugin/ImagesPanel.cpp:563
++#: src/hugin/ImagesPanel.cpp:562
+ #, c-format
+ msgid "Really Delete %d control points?"
+ msgstr "%d Kontrollpunkte wirklich löschen?"
+
+-#: src/hugin/ImagesPanel.cpp:565
++#: src/hugin/ImagesPanel.cpp:564
+ msgid "Delete Control Points"
+ msgstr "Kontrollpunkte löschen"
+
+-#: src/hugin/LensPanel.cpp:649
++#: src/hugin/LensPanel.cpp:650
+ msgid "Not a jpeg file:"
+ msgstr "Kein JPEG Bild"
+
+-#: src/hugin/LensPanel.cpp:654
+-#: src/hugin/LensPanel.cpp:708
+-#: src/hugin/LensPanel.cpp:784
+-#: src/hugin/LensPanel.cpp:800
+-#: src/hugin/LensPanel.cpp:818
++#: src/hugin/LensPanel.cpp:655 src/hugin/LensPanel.cpp:709
++#: src/hugin/LensPanel.cpp:785 src/hugin/LensPanel.cpp:801
++#: src/hugin/LensPanel.cpp:819
+ msgid "Please select an image and try again"
+ msgstr "Bitte Bild auswählen und erneut versuchen"
+
+-#: src/hugin/LensPanel.cpp:672
++#: src/hugin/LensPanel.cpp:673
+ msgid "Save lens parameters file"
+ msgstr "Objektivparameter speichern"
+
+-#: src/hugin/LensPanel.cpp:674
+-#: src/hugin/LensPanel.cpp:724
++#: src/hugin/LensPanel.cpp:675 src/hugin/LensPanel.cpp:725
+ msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
+ msgstr "Objektiv Projekt Datei (*.ini)|*.ini|Alle Dateien (*.*)|*.*"
+
+-#: src/hugin/LensPanel.cpp:722
++#: src/hugin/LensPanel.cpp:723
+ msgid "Load lens parameters"
+ msgstr "Objektivparameter laden"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Enter new lens number"
+ msgstr "Neue Objektivnummer eingeben"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Lens number"
+ msgstr "Objektiv Nr."
+
+-#: src/hugin/LensPanel.cpp:809
++#: src/hugin/LensPanel.cpp:810
+ msgid "Change lens number"
+ msgstr "Objektivnummer ändern"
+
+-#: src/hugin/LensPanel.cpp:833
++#: src/hugin/LensPanel.cpp:834
+ msgid ""
+ "Enter Crop Factor for image\n"
+ "\n"
+@@ -597,9 +590,10 @@
+ "Der Verlängerungsfaktor c wird mit\n"
+ "c = 43.3 / d\n"
+ "\n"
+-"berechnet, wobei d die Diagonale des Films oder Bildaufnahmechips in mm angibt."
++"berechnet, wobei d die Diagonale des Films oder Bildaufnahmechips in mm "
++"angibt."
+
+-#: src/hugin/LensPanel.cpp:834
++#: src/hugin/LensPanel.cpp:835
+ msgid "Adding Image"
+ msgstr "Bild hinzufügen"
+
+@@ -633,101 +627,123 @@
+ msgid "forced close"
+ msgstr "Erzwungenes Beenden"
+
+-#: src/hugin/MainFrame.cpp:491
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "No images - Nothing to do"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "Warning"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:495
+ #, c-format
+ msgid "saved project %s"
+ msgstr "Projekt speichern unter %s"
+
+-#: src/hugin/MainFrame.cpp:500
++#: src/hugin/MainFrame.cpp:508
+ msgid "Save project file"
+ msgstr "Projekt speichern"
+
+-#: src/hugin/MainFrame.cpp:502
++#: src/hugin/MainFrame.cpp:510
+ msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*"
+ msgstr "Projekt Dateien (*.pto)|*.pto|Alle Dateien (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:515
++#: src/hugin/MainFrame.cpp:527
+ msgid "Save PTStitcher script file"
+ msgstr "PTStitcher Skript Datei speichern"
+
+-#: src/hugin/MainFrame.cpp:517
++#: src/hugin/MainFrame.cpp:529
+ msgid "PTStitcher files (*.txt)|*.txt"
+ msgstr "PTStitcher Dateien (*.txt)|*.txt"
+
+-#: src/hugin/MainFrame.cpp:543
++#: src/hugin/MainFrame.cpp:555
+ msgid "Open project: "
+ msgstr "Projekt öffnen: "
+
+-#: src/hugin/MainFrame.cpp:555
++#: src/hugin/MainFrame.cpp:567
+ msgid "Project opened"
+ msgstr "Projektdatei geöffnet"
+
+-#: src/hugin/MainFrame.cpp:565
++#: src/hugin/MainFrame.cpp:577
+ msgid "Error opening project: "
+ msgstr "Fehler beim öffnen des Projekt:"
+
+-#: src/hugin/MainFrame.cpp:583
++#: src/hugin/MainFrame.cpp:595
+ msgid "Open project file"
+ msgstr "Projekt Datei öffnen"
+
+-#: src/hugin/MainFrame.cpp:585
+-msgid "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*.*)|*.*"
+-msgstr "Projekt Dateien (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Alle Dateien (*.*)|*.*"
++#: src/hugin/MainFrame.cpp:597
++msgid ""
++"Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
++"(*.*)|*.*"
++msgstr ""
++"Projekt Dateien (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Alle "
++"Dateien (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:593
++#: src/hugin/MainFrame.cpp:605
+ msgid "Open project: cancel"
+ msgstr "Projekt öffnen: Abbrechen"
+
+-#: src/hugin/MainFrame.cpp:615
+-#: src/include/hugin/wxPanoCommand.h:169
+-msgid "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files (*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
+-msgstr "Bilddateien (*.jpg)|*.jpg;*.JPG|Bilddateien (*.png)|*.png;*.PNG|Bilddateien (*.tif)|*.tif;*.TIF|Alle Dateien (*.*)|*."
++#: src/hugin/MainFrame.cpp:627 src/include/hugin/wxPanoCommand.h:169
++msgid ""
++"Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files "
++"(*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
++msgstr ""
++"Bilddateien (*.jpg)|*.jpg;*.JPG|Bilddateien (*.png)|*.png;*.PNG|Bilddateien "
++"(*.tif)|*.tif;*.TIF|Alle Dateien (*.*)|*."
+
+-#: src/hugin/MainFrame.cpp:616
+-#: src/include/hugin/wxPanoCommand.h:170
++#: src/hugin/MainFrame.cpp:628 src/include/hugin/wxPanoCommand.h:170
+ msgid "Add images"
+ msgstr "Bilder hinzufügen"
+
+-#: src/hugin/MainFrame.cpp:660
++#: src/hugin/MainFrame.cpp:672
+ msgid "Add Image: cancel"
+ msgstr "Bilder hinzufügen: abgebrochen"
+
+-#: src/hugin/MainFrame.cpp:985
++#: src/hugin/MainFrame.cpp:997
+ msgid "hugin - FAQ"
+ msgstr "hugin - FAQ"
+
+-#: src/hugin/MainFrame.cpp:1064
++#: src/hugin/MainFrame.cpp:1076
+ msgid "Fine-tuning all points"
+ msgstr "Alle Kontrollpunkt verfeinern"
+
+-#: src/hugin/MainFrame.cpp:1066
++#: src/hugin/MainFrame.cpp:1078
+ msgid "Finetuning"
+ msgstr "Verfeinern"
+
+-#: src/hugin/MainFrame.cpp:1150
++#: src/hugin/MainFrame.cpp:1162
+ #, 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 point 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 point of the current project\n"
+ msgstr ""
+-"%d Punkte verfeinert, %d Punkt wurden aufgrund niedriger Korrelation nicht aktualisiert\n"
++"%d Punkte verfeinert, %d Punkt wurden aufgrund niedriger Korrelation nicht "
++"aktualisiert\n"
+ "\n"
+-"Hinweis: Der Fehler der verfeinerten Punkte wurde auf Korrelationskoeffizient gesetzt.\n"
++"Hinweis: Der Fehler der verfeinerten Punkte wurde auf "
++"Korrelationskoeffizient gesetzt.\n"
+ "Problematische Punkte können nach dem Verfeinern, aber vor der Optimierung\n"
+ "durch den Fehler <= %f. ermittelt werden.\n"
+-"Die Fehlerpunkt ohne definierten Wert (typischerweise in Regionen mit einheitlicher Farbe)\n"
++"Die Fehlerpunkt ohne definierten Wert (typischerweise in Regionen mit "
++"einheitlicher Farbe)\n"
+ "werden auf 0 gesetzt\n"
+ "\n"
+-"Benutze die Kontrollliste (F3) um alle Punkte des aktuellen Projekts zu sehen\n"
++"Benutze die Kontrollliste (F3) um alle Punkte des aktuellen Projekts zu "
++"sehen\n"
+
+-#: src/hugin/MainFrame.cpp:1152
++#: src/hugin/MainFrame.cpp:1164
+ msgid "Fine-tune result"
+ msgstr "Verfeinerungsergebnis"
+
+@@ -773,23 +789,24 @@
+ msgid "No enblend commandline tool selected"
+ msgstr "Kein Enblend Kommando ausgewählt"
+
+-#: src/hugin/NonaStitcherPanel.cpp:347
++#: src/hugin/NonaStitcherPanel.cpp:349
+ msgid ""
+ "Can not call enblend with a command line > 2000 characters.\n"
+ "This is a Windows limitiation\n"
+ "Please use less images, or place the images in a folder with\n"
+ "a shorter pathname"
+ msgstr ""
+-"Es ist nicht möglich Enblend mit Argumenten länger als 2000 Zeichenaufzurufen.\n"
++"Es ist nicht möglich Enblend mit Argumenten länger als 2000 "
++"Zeichenaufzurufen.\n"
+ "Dies ist ein Begrenzung von Microsoft Windows\n"
+ "Bitte wählen sie weniger Bilder oder plazieren sie die Bilder in einem\n"
+ "Ordner mit einem kürzeren Pfadnamen"
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid "Running Enblend"
+ msgstr "Starte Enblend"
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid ""
+ "Enblend will take a while to finish processing the panorama\n"
+ "You can watch the enblend progress in the command window"
+@@ -797,7 +814,7 @@
+ "Enblend wird einige Zeit für das Panorama benötigen\n"
+ "Sie können den Fortschritt im Kommandofenster beobachten"
+
+-#: src/hugin/NonaStitcherPanel.cpp:359
++#: src/hugin/NonaStitcherPanel.cpp:363
+ msgid ""
+ "Could not execute enblend, system() failed: \n"
+ "Command was :"
+@@ -805,15 +822,15 @@
+ "Enblend konnte nicht ausgeführt werden, system() Aufruf fehlgeschlagen:\n"
+ "Kommando :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:360
++#: src/hugin/NonaStitcherPanel.cpp:364
+ msgid "Error returned was :"
+ msgstr "Fehler:"
+
+-#: src/hugin/NonaStitcherPanel.cpp:388
++#: src/hugin/NonaStitcherPanel.cpp:392
+ msgid "CreateProcess Error"
+ msgstr "CreateProccess() meldete einen Fehler zurück"
+
+-#: src/hugin/NonaStitcherPanel.cpp:401
++#: src/hugin/NonaStitcherPanel.cpp:406
+ msgid "enblend error"
+ msgstr "Enblend Fehler"
+
+@@ -821,13 +838,11 @@
+ msgid "The druid has no advice."
+ msgstr "Der Druide hat keinen Vorschlag"
+
+-#: src/hugin/PanoDruid.cpp:53
+-#: src/hugin/PreviewFrame.cpp:554
++#: src/hugin/PanoDruid.cpp:53 src/hugin/PreviewFrame.cpp:554
+ msgid "The druid finds no problems with your panorama."
+ msgstr "Der Druide hat kein Problem in ihrem Panorama gefunden"
+
+-#: src/hugin/PanoDruid.cpp:54
+-#: src/hugin/PreviewFrame.cpp:555
++#: src/hugin/PanoDruid.cpp:54 src/hugin/PreviewFrame.cpp:555
+ msgid ""
+ "Stitch your final image now, and then use an image editor\n"
+ "such as the GNU Image Manipulation Program (the GIMP)\n"
+@@ -836,13 +851,11 @@
+ "Füge jetzt dein endgültiges Panorama zusammen und benutzt dann eine\n"
+ "Bildverarbeitung, (z.B. GIMP) um dem Panorama den letzten Schliff zu geben."
+
+-#: src/hugin/PanoDruid.cpp:63
+-#: src/hugin/PreviewFrame.cpp:574
++#: src/hugin/PanoDruid.cpp:63 src/hugin/PreviewFrame.cpp:574
+ msgid "Warning: you haven't saved the current project."
+ msgstr "Warnung: Sie haben das aktuelle Projekt nicht gesichert."
+
+-#: src/hugin/PanoDruid.cpp:64
+-#: src/hugin/PreviewFrame.cpp:575
++#: src/hugin/PanoDruid.cpp:64 src/hugin/PreviewFrame.cpp:575
+ msgid ""
+ "While everything else seems to be ready to stitch,\n"
+ "don't forget to save your project file so you can\n"
+@@ -853,13 +866,11 @@
+ "können sie noch weiter herumprobieren\n"
+ "oder die Einstellungen später verändern."
+
+-#: src/hugin/PanoDruid.cpp:73
+-#: src/hugin/PreviewFrame.cpp:570
++#: src/hugin/PanoDruid.cpp:73 src/hugin/PreviewFrame.cpp:570
+ msgid "Warning: current stitch has huge dimensions."
+ msgstr "Warnung: Derzeitiges Panorama ist sehr groß"
+
+-#: src/hugin/PanoDruid.cpp:74
+-#: src/hugin/PreviewFrame.cpp:571
++#: src/hugin/PanoDruid.cpp:74 src/hugin/PreviewFrame.cpp:571
+ msgid ""
+ "Very large pixel dimensions are currently entered.\n"
+ "Some computers may take an excessively long time\n"
+@@ -869,17 +880,17 @@
+ "pixel dimensions which will give the best quality."
+ msgstr ""
+ "Augenblicklich ist eine sehr hohe Bildgröße eingestellt.\n"
+-"Auch auf schnellen Computern dauert die Erstellung solcher Bilder sehr lange\n"
++"Auch auf schnellen Computern dauert die Erstellung solcher Bilder sehr "
++"lange\n"
+ "Für ein optimales Ergebnis benutzen sie den Berechne Knopf\n"
+-"im Panorama Optionen Reiter. Damit können sie die optimale Bildgröße des Panoramas berechnen."
++"im Panorama Optionen Reiter. Damit können sie die optimale Bildgröße des "
++"Panoramas berechnen."
+
+-#: src/hugin/PanoDruid.cpp:104
+-#: src/hugin/PreviewFrame.cpp:566
++#: src/hugin/PanoDruid.cpp:104 src/hugin/PreviewFrame.cpp:566
+ msgid "The Horizontal Field of View (HFOV) may be too low."
+ msgstr "Der Horizontaler Bildwinkel (HFOV) ist wahrscheinlich zu klein"
+
+-#: src/hugin/PanoDruid.cpp:105
+-#: src/hugin/PreviewFrame.cpp:567
++#: src/hugin/PanoDruid.cpp:105 src/hugin/PreviewFrame.cpp:567
+ msgid ""
+ "Check that the focal lengths and/or hfov figures\n"
+ "for each image are correct for the camera settings.\n"
+@@ -911,7 +922,8 @@
+ "Durch das Hinzufügen einer vertikalen Führungslinie ermöglichen\n"
+ "sie dem Optimierer Häuser oder Bäume oder andere senkrechte\n"
+ "Dinge im Endergebnis auch senkrecht erscheinen zu lassen.\n"
+-"Die horizontale Führungslinie stellt sicher, daß sich der Horizont nicht verbiegt."
++"Die horizontale Führungslinie stellt sicher, daß sich der Horizont nicht "
++"verbiegt."
+
+ #: src/hugin/PanoDruid.cpp:137
+ msgid "Run the Optimizer to estimate the image positions."
+@@ -975,23 +987,20 @@
+ "im Kontrollpunkt Karteireiter, für jedes identische optische Merkmal\n"
+ " von überlappenden Bildern hinzu."
+
+-#: src/hugin/PanoDruid.cpp:213
+-#: src/hugin/PreviewFrame.cpp:562
++#: src/hugin/PanoDruid.cpp:213 src/hugin/PreviewFrame.cpp:562
+ msgid "Add at least one more image."
+ msgstr "Noch ein weiteres Bild anfügen."
+
+-#: src/hugin/PanoDruid.cpp:214
+-#: src/hugin/PreviewFrame.cpp:563
++#: src/hugin/PanoDruid.cpp:214 src/hugin/PreviewFrame.cpp:563
+ msgid "You should have at least two files listed in the Images tab."
+-msgstr "Sie sollten mindestens zwei Dateien im Bild-Karteireiter aufgelistet sein."
++msgstr ""
++"Sie sollten mindestens zwei Dateien im Bild-Karteireiter aufgelistet sein."
+
+-#: src/hugin/PanoDruid.cpp:228
+-#: src/hugin/PreviewFrame.cpp:558
++#: src/hugin/PanoDruid.cpp:228 src/hugin/PreviewFrame.cpp:558
+ msgid "To get started, add some image files."
+ msgstr "Am Anfang fügen sie einige Bilder hinzu."
+
+-#: src/hugin/PanoDruid.cpp:229
+-#: src/hugin/PreviewFrame.cpp:559
++#: src/hugin/PanoDruid.cpp:229 src/hugin/PreviewFrame.cpp:559
+ msgid "You can add any number of images using the Images tab."
+ msgstr "Sie können so viele Bilder hinzufügen wie sie wollen."
+
+@@ -999,13 +1008,11 @@
+ msgid "the Panorama druid"
+ msgstr "Der Panorama Druide"
+
+-#: src/hugin/PanoPanel.cpp:193
+-#: src/hugin/PreviewFrame.cpp:411
++#: src/hugin/PanoPanel.cpp:193 src/hugin/PreviewFrame.cpp:411
+ msgid "Rectilinear"
+ msgstr "Rectilinear"
+
+-#: src/hugin/PanoPanel.cpp:194
+-#: src/hugin/PreviewFrame.cpp:412
++#: src/hugin/PanoPanel.cpp:194 src/hugin/PreviewFrame.cpp:412
+ msgid "Cylindrical"
+ msgstr "Zylindrisch"
+
+@@ -1013,7 +1020,7 @@
+ msgid "width needs to be an integer bigger than 0"
+ msgstr "Die Breite muß größer als 0 sein."
+
+-#: src/hugin/PanoPanel.cpp:502
++#: src/hugin/PanoPanel.cpp:506
+ msgid "Create panorama image"
+ msgstr "Erstelle das Panoramabild"
+
+@@ -1049,8 +1056,8 @@
+ msgid "Select PTStitcher"
+ msgstr "PTStitcher.exe angeben"
+
+-#: src/hugin/PreferencesDialog.cpp:188
+-#: src/hugin/RunOptimizerFrame.cpp:108
++#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:109
++#: src/hugin/RunOptimizerFrame.cpp:123
+ msgid "Select PTOptimizer"
+ msgstr "PTOptimierer wählen"
+
+@@ -1058,8 +1065,7 @@
+ msgid "Select Enblend"
+ msgstr "enblend.exe angeben"
+
+-#: src/hugin/PreferencesDialog.cpp:220
+-#: src/hugin/PreferencesDialog.cpp:236
++#: src/hugin/PreferencesDialog.cpp:220 src/hugin/PreferencesDialog.cpp:236
+ #: src/hugin/xrc/pref_dialog.xrs:49
+ msgid "Select Autopano"
+ msgstr "Autopano wählen"
+@@ -1144,44 +1150,37 @@
+ msgid "Bicubic"
+ msgstr "Bikubisch"
+
+-#: src/hugin/PTStitcherPanel.cpp:265
+-#: src/hugin/xrc/nona_panel.xrs:4
++#: src/hugin/PTStitcherPanel.cpp:265 src/hugin/xrc/nona_panel.xrs:4
+ #: src/hugin/xrc/ptstitcher_panel.xrs:4
+ msgid "Spline 16"
+ msgstr "Spline 16"
+
+-#: src/hugin/PTStitcherPanel.cpp:266
+-#: src/hugin/xrc/nona_panel.xrs:5
++#: src/hugin/PTStitcherPanel.cpp:266 src/hugin/xrc/nona_panel.xrs:5
+ #: src/hugin/xrc/ptstitcher_panel.xrs:5
+ msgid "Spline 36"
+ msgstr "Spline 36"
+
+-#: src/hugin/PTStitcherPanel.cpp:267
+-#: src/hugin/xrc/nona_panel.xrs:6
++#: src/hugin/PTStitcherPanel.cpp:267 src/hugin/xrc/nona_panel.xrs:6
+ #: src/hugin/xrc/ptstitcher_panel.xrs:6
+ msgid "Sinc 256"
+ msgstr "Sinc 256"
+
+-#: src/hugin/PTStitcherPanel.cpp:268
+-#: src/hugin/xrc/nona_panel.xrs:7
++#: src/hugin/PTStitcherPanel.cpp:268 src/hugin/xrc/nona_panel.xrs:7
+ #: src/hugin/xrc/ptstitcher_panel.xrs:7
+ msgid "Spline 64"
+ msgstr "Spline 64"
+
+-#: src/hugin/PTStitcherPanel.cpp:269
+-#: src/hugin/xrc/nona_panel.xrs:8
++#: src/hugin/PTStitcherPanel.cpp:269 src/hugin/xrc/nona_panel.xrs:8
+ #: src/hugin/xrc/ptstitcher_panel.xrs:8
+ msgid "Bilinear"
+ msgstr "Bilinear"
+
+-#: src/hugin/PTStitcherPanel.cpp:270
+-#: src/hugin/xrc/nona_panel.xrs:9
++#: src/hugin/PTStitcherPanel.cpp:270 src/hugin/xrc/nona_panel.xrs:9
+ #: src/hugin/xrc/ptstitcher_panel.xrs:9
+ msgid "Nearest neighbour"
+ msgstr "Nächster Nachbar"
+
+-#: src/hugin/PTStitcherPanel.cpp:271
+-#: src/hugin/xrc/nona_panel.xrs:10
++#: src/hugin/PTStitcherPanel.cpp:271 src/hugin/xrc/nona_panel.xrs:10
+ #: src/hugin/xrc/ptstitcher_panel.xrs:10
+ msgid "Sinc 1024"
+ msgstr "Sinc 1024"
+@@ -1192,48 +1191,50 @@
+
+ #: src/hugin/PTStitcherPanel.cpp:431
+ msgid "PTStitcher.exe does not support QTVR output on Windows and Linux"
+-msgstr "PTStitcher.exe unterstützt die QTVR-Ausgabe unter Windows und Linux nicht"
++msgstr ""
++"PTStitcher.exe unterstützt die QTVR-Ausgabe unter Windows und Linux nicht"
+
+ #: src/hugin/PTStitcherPanel.cpp:431
+ msgid "PTStitcher note"
+ msgstr "PTStitcher Bemerkung"
+
+-#: src/hugin/RunOptimizerFrame.cpp:116
++#: src/hugin/RunOptimizerFrame.cpp:117
+ msgid "No PTOptimizer.exe selected"
+ msgstr "Keine PTOptimizer.exe wurde ausgewählt"
+
+-#: src/hugin/RunOptimizerFrame.cpp:140
++#: src/hugin/RunOptimizerFrame.cpp:131
++#, fuzzy
++msgid "No PTOptimizer selected"
++msgstr "Keine PTOptimizer.exe wurde ausgewählt"
++
++#: src/hugin/RunOptimizerFrame.cpp:155
+ msgid "Failed to launch PTOptimizer."
+ msgstr "Konnte PTOptimierer nicht ausführen"
+
+-#: src/hugin/RunOptimizerFrame.cpp:151
++#: src/hugin/RunOptimizerFrame.cpp:166
+ msgid "Could not obtain PTOptimizer output"
+ msgstr "Konnte PTOptimizer ausgabe nicht finden"
+
+-#: src/hugin/RunOptimizerFrame.cpp:161
++#: src/hugin/RunOptimizerFrame.cpp:176
+ msgid "Stop"
+ msgstr "Anhalten"
+
+-#: src/hugin/RunOptimizerFrame.cpp:223
++#: src/hugin/RunOptimizerFrame.cpp:238
+ #, c-format
+ msgid "Strategy %d, Iteration %d, average distance: %f"
+ msgstr "Vorgehensweise %d, Iteration %d, durchschnittliche Entfernung: %f"
+
+-#: src/hugin/RunOptimizerFrame.cpp:295
+-#: src/hugin/xrc/edit_text.xrs:3
+-#: src/hugin/xrc/pref_dialog.xrs:70
+-msgid "Cancel"
+-msgstr "Abbrechen"
+-
+-#: src/hugin/RunOptimizerFrame.cpp:327
++#: src/hugin/RunOptimizerFrame.cpp:342
+ msgid ""
+ "Optimizer run finished.\n"
+ "WARNING: a very small Field of View (v) has been estimated\n"
+ "\n"
+ "The results are probably invalid.\n"
+-"Please optimize the View only for full 360 deg. panoramas or when you know what you're doing.\n"
++"Please optimize the View only for full 360 deg. panoramas or when you know "
++"what you're doing.\n"
+ "\n"
+-"The Field of View (v) can sometimes be optimized for partial panoramas as well,\n"
++"The Field of View (v) can sometimes be optimized for partial panoramas as "
++"well,\n"
+ "when the images are already aligned well."
+ msgstr ""
+ "Optimierung beendet\n"
+@@ -1241,7 +1242,7 @@
+ "\n"
+ "Der Ergebnis ist wahrscheinlich nicht richtig"
+
+-#: src/hugin/RunOptimizerFrame.cpp:329
++#: src/hugin/RunOptimizerFrame.cpp:344
+ #, c-format
+ msgid ""
+ "Optimizer run finished.\n"
+@@ -1311,8 +1312,7 @@
+ msgid "Image file not found"
+ msgstr "Bilddatei nicht gefunden"
+
+-#: src/hugin/xrc/about.xrs:1
+-#: src/hugin/xrc/main_tool.xrs:31
++#: src/hugin/xrc/about.xrs:1 src/hugin/xrc/main_tool.xrs:31
+ msgid "About Hugin"
+ msgstr "Über Hugin"
+
+@@ -1325,7 +1325,8 @@
+ msgstr "Ankerbild"
+
+ #: src/hugin/xrc/anchor_orientation.xrs:2
+-msgid "Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
++msgid ""
++"Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
+ msgstr ""
+ "Yaw und Neigung mit der linken Maustaste setzen.\n"
+ "Benutzen sie die rechte Maustaste um den Rollwinkel zu setzten."
+@@ -1396,23 +1397,27 @@
+
+ #: src/hugin/xrc/cp_editor_panel.xrs:16
+ msgid "immediately add control point when selecting a second point"
+-msgstr "Sofortiges hinzufügen des Kontrollpunkt, wenn der zweite Punkt ausgewählt wurde."
++msgstr ""
++"Sofortiges hinzufügen des Kontrollpunkt, wenn der zweite Punkt ausgewählt "
++"wurde."
+
+ #: src/hugin/xrc/cp_editor_panel.xrs:17
+ msgid "auto estimate"
+ msgstr "Automatisches &Schätzen"
+
+ #: src/hugin/xrc/cp_editor_panel.xrs:18
+-msgid "tries to estimate shift between the images and use it while placing control points"
+-msgstr "versucht die Verschiebung zwischen den Bildern zu schätzen und benutzt sie zur Schätzung des Kontrollpunktes im anderen Bild"
++msgid ""
++"tries to estimate shift between the images and use it while placing control "
++"points"
++msgstr ""
++"versucht die Verschiebung zwischen den Bildern zu schätzen und benutzt sie "
++"zur Schätzung des Kontrollpunktes im anderen Bild"
+
+-#: src/hugin/xrc/cp_editor_panel.xrs:19
+-#: src/hugin/xrc/cp_editor_panel.xrs:21
++#: src/hugin/xrc/cp_editor_panel.xrs:19 src/hugin/xrc/cp_editor_panel.xrs:21
+ msgid "x:"
+ msgstr "x:"
+
+-#: src/hugin/xrc/cp_editor_panel.xrs:20
+-#: src/hugin/xrc/cp_editor_panel.xrs:22
++#: src/hugin/xrc/cp_editor_panel.xrs:20 src/hugin/xrc/cp_editor_panel.xrs:22
+ msgid "y:"
+ msgstr "y:"
+
+@@ -1428,8 +1433,7 @@
+ msgid "horizontal line"
+ msgstr "horiz. Linie"
+
+-#: src/hugin/xrc/cp_editor_panel.xrs:27
+-#: src/hugin/xrc/cp_list_frame.xrs:2
++#: src/hugin/xrc/cp_editor_panel.xrs:27 src/hugin/xrc/cp_list_frame.xrs:2
+ msgid "Delete"
+ msgstr "Löschen"
+
+@@ -1441,8 +1445,7 @@
+ msgid "add a new Point"
+ msgstr "Ein neuen Punkt hinzufügen"
+
+-#: src/hugin/xrc/cp_list_frame.xrs:1
+-#: src/hugin/xrc/main_frame.xrs:4
++#: src/hugin/xrc/cp_list_frame.xrs:1 src/hugin/xrc/main_frame.xrs:4
+ msgid "Control Points"
+ msgstr "Kontrollpunkte"
+
+@@ -1455,8 +1458,12 @@
+ msgstr "Panorama Tools Skript bearbeiten"
+
+ #: src/hugin/xrc/edit_script_dialog.xrs:2
+-msgid "This is the script which will be sent to the Panorama Tools engine. Editing these lines is an advanced technique."
+-msgstr "Diese Skript wird zur Panorama Tools Maschine gesendet. Das Bearbeiten dieser Zeilen ist eine fortgeschrittene Technik."
++msgid ""
++"This is the script which will be sent to the Panorama Tools engine. Editing "
++"these lines is an advanced technique."
++msgstr ""
++"Diese Skript wird zur Panorama Tools Maschine gesendet. Das Bearbeiten "
++"dieser Zeilen ist eine fortgeschrittene Technik."
+
+ #: src/hugin/xrc/edit_script_dialog.xrs:3
+ msgid "Continue with these changes"
+@@ -1470,8 +1477,7 @@
+ msgid "Text mode"
+ msgstr "Text Modus:"
+
+-#: src/hugin/xrc/edit_text.xrs:2
+-#: src/hugin/xrc/main_tool.xrs:23
++#: src/hugin/xrc/edit_text.xrs:2 src/hugin/xrc/main_tool.xrs:23
+ #: src/hugin/xrc/optimize_panel.xrs:2
+ msgid "Optimize"
+ msgstr "Optimieren"
+@@ -1480,14 +1486,12 @@
+ msgid "Hugin Reference"
+ msgstr "Hugin Referenz"
+
+-#: src/hugin/xrc/help.xrs:2
+-#: src/hugin/xrc/image_center.xrs:3
++#: src/hugin/xrc/help.xrs:2 src/hugin/xrc/image_center.xrs:3
+ #: src/hugin/xrc/keyboard_help.xrs:2
+ msgid "Close"
+ msgstr "Schließen"
+
+-#: src/hugin/xrc/image_center.xrs:1
+-#: src/hugin/xrc/pref_dialog.xrs:69
++#: src/hugin/xrc/image_center.xrs:1 src/hugin/xrc/pref_dialog.xrs:69
+ #: src/hugin/xrc/run_optimizer_frame.xrs:2
+ msgid "Apply"
+ msgstr "Anwenden"
+@@ -1547,8 +1551,12 @@
+ msgstr "Positionsanker"
+
+ #: src/hugin/xrc/images_panel.xrs:12
+-msgid "use currently selected image as anchor image. That is, do not optimize the (complete) position of this image."
+-msgstr "Benutzte das aktuelle Bild als Ankerbild. Dadurch wird die Position für Bild nicht verändert."
++msgid ""
++"use currently selected image as anchor image. That is, do not optimize the "
++"(complete) position of this image."
++msgstr ""
++"Benutzte das aktuelle Bild als Ankerbild. Dadurch wird die Position für Bild "
++"nicht verändert."
+
+ #: src/hugin/xrc/images_panel.xrs:13
+ msgid "Adjust the anchor spot..."
+@@ -1594,8 +1602,7 @@
+ msgid "Remove control points connecting the selected images"
+ msgstr "Entferne mit dem Bild verbundene Kontrollpunkte"
+
+-#: src/hugin/xrc/images_panel.xrs:24
+-#: src/hugin/xrc/optimize_panel.xrs:23
++#: src/hugin/xrc/images_panel.xrs:24 src/hugin/xrc/optimize_panel.xrs:23
+ msgid "Image Orientation"
+ msgstr "Bildausrichtung"
+
+@@ -1647,20 +1654,15 @@
+ msgid "degrees of view (v):"
+ msgstr "Blickwinkel (v):"
+
+-#: src/hugin/xrc/lens_panel.xrs:9
+-#: src/hugin/xrc/lens_panel.xrs:10
++#: src/hugin/xrc/lens_panel.xrs:9 src/hugin/xrc/lens_panel.xrs:10
+ #: src/hugin/xrc/lens_panel.xrs:11
+ msgid "Horizontal Field of View"
+ msgstr "Horizontaler Bildwinkel (v)"
+
+-#: src/hugin/xrc/lens_panel.xrs:12
+-#: src/hugin/xrc/lens_panel.xrs:25
+-#: src/hugin/xrc/lens_panel.xrs:27
+-#: src/hugin/xrc/lens_panel.xrs:29
+-#: src/hugin/xrc/lens_panel.xrs:32
+-#: src/hugin/xrc/lens_panel.xrs:34
+-#: src/hugin/xrc/lens_panel.xrs:40
+-#: src/hugin/xrc/lens_panel.xrs:42
++#: src/hugin/xrc/lens_panel.xrs:12 src/hugin/xrc/lens_panel.xrs:25
++#: src/hugin/xrc/lens_panel.xrs:27 src/hugin/xrc/lens_panel.xrs:29
++#: src/hugin/xrc/lens_panel.xrs:32 src/hugin/xrc/lens_panel.xrs:34
++#: src/hugin/xrc/lens_panel.xrs:40 src/hugin/xrc/lens_panel.xrs:42
+ msgid "Inherit"
+ msgstr "Vererben"
+
+@@ -1668,8 +1670,7 @@
+ msgid "focal length:"
+ msgstr "Brennweite:"
+
+-#: src/hugin/xrc/lens_panel.xrs:14
+-#: src/hugin/xrc/lens_panel.xrs:15
++#: src/hugin/xrc/lens_panel.xrs:14 src/hugin/xrc/lens_panel.xrs:15
+ msgid "real focal length of the optic"
+ msgstr "Reale Brennweite des Objektivs"
+
+@@ -1681,14 +1682,12 @@
+ msgid "crop factor:"
+ msgstr "Fehlerfaktor:"
+
+-#: src/hugin/xrc/lens_panel.xrs:18
+-#: src/hugin/xrc/lens_panel.xrs:19
++#: src/hugin/xrc/lens_panel.xrs:18 src/hugin/xrc/lens_panel.xrs:19
+ #: src/hugin/xrc/lens_panel.xrs:22
+ msgid "35mm film diameter / ccd diameter"
+ msgstr "35mm Filmdurchmesser / CCD Durchmesser"
+
+-#: src/hugin/xrc/lens_panel.xrs:20
+-#: src/hugin/xrc/lens_panel.xrs:21
++#: src/hugin/xrc/lens_panel.xrs:20 src/hugin/xrc/lens_panel.xrs:21
+ msgid "equivalent to 35mm film optics"
+ msgstr "Äquivalent zur einer 35mm Filmoptik"
+
+@@ -1696,18 +1695,15 @@
+ msgid "Lens Correction Parameters"
+ msgstr "Objektivkorrekturparameter"
+
+-#: src/hugin/xrc/lens_panel.xrs:24
+-#: src/hugin/xrc/optimize_panel.xrs:26
++#: src/hugin/xrc/lens_panel.xrs:24 src/hugin/xrc/optimize_panel.xrs:26
+ msgid "distortion (a):"
+ msgstr "Verzerrung (a)"
+
+-#: src/hugin/xrc/lens_panel.xrs:26
+-#: src/hugin/xrc/optimize_panel.xrs:27
++#: src/hugin/xrc/lens_panel.xrs:26 src/hugin/xrc/optimize_panel.xrs:27
+ msgid "barrel (b):"
+ msgstr "Tonnenverzerrung (b):"
+
+-#: src/hugin/xrc/lens_panel.xrs:28
+-#: src/hugin/xrc/optimize_panel.xrs:28
++#: src/hugin/xrc/lens_panel.xrs:28 src/hugin/xrc/optimize_panel.xrs:28
+ msgid "distortion (c):"
+ msgstr "Verzerrung (c):"
+
+@@ -1759,8 +1755,7 @@
+ msgid "Load lens parameters from a file"
+ msgstr "Objektivparameter aus einer Datei laden"
+
+-#: src/hugin/xrc/lens_panel.xrs:46
+-#: src/hugin/xrc/main_tool.xrs:8
++#: src/hugin/xrc/lens_panel.xrs:46 src/hugin/xrc/main_tool.xrs:8
+ msgid "Save"
+ msgstr "Speichern"
+
+@@ -1782,7 +1777,8 @@
+
+ #: src/hugin/xrc/lens_panel.xrs:51
+ msgid "Create a new lens and assign it to selected images"
+-msgstr "Neue Objektivspezifikation erzeugen und den ausgewählten Bildern zuweisen."
++msgstr ""
++"Neue Objektivspezifikation erzeugen und den ausgewählten Bildern zuweisen."
+
+ #: src/hugin/xrc/lens_panel.xrs:52
+ msgid "Change lens"
+@@ -1812,8 +1808,7 @@
+ msgid "Stitcher"
+ msgstr "Zusammenfügen"
+
+-#: src/hugin/xrc/main_menubar.xrs:1
+-#: src/hugin/xrc/main_menu.xrs:1
++#: src/hugin/xrc/main_menubar.xrs:1 src/hugin/xrc/main_menu.xrs:1
+ msgid "&File"
+ msgstr "&Datei"
+
+@@ -1825,8 +1820,7 @@
+ msgid "Exit this application"
+ msgstr "Programms verlassen"
+
+-#: src/hugin/xrc/main_menubar.xrs:4
+-#: src/hugin/xrc/main_menu.xrs:31
++#: src/hugin/xrc/main_menubar.xrs:4 src/hugin/xrc/main_menu.xrs:31
+ #: src/hugin/xrc/main_menu.xrs:34
+ msgid "&Help"
+ msgstr "&Hilfe"
+@@ -1843,8 +1837,7 @@
+ msgid "&New"
+ msgstr "&Neu"
+
+-#: src/hugin/xrc/main_menu.xrs:3
+-#: src/hugin/xrc/main_tool.xrs:1
++#: src/hugin/xrc/main_menu.xrs:3 src/hugin/xrc/main_tool.xrs:1
+ msgid "New project"
+ msgstr "Neues Projekt"
+
+@@ -1852,8 +1845,7 @@
+ msgid "&Open"
+ msgstr "&Öffnen"
+
+-#: src/hugin/xrc/main_menu.xrs:5
+-#: src/hugin/xrc/main_tool.xrs:4
++#: src/hugin/xrc/main_menu.xrs:5 src/hugin/xrc/main_tool.xrs:4
+ msgid "Open project"
+ msgstr "Projekt öffnen"
+
+@@ -1861,8 +1853,7 @@
+ msgid "&Save"
+ msgstr "S&peichern"
+
+-#: src/hugin/xrc/main_menu.xrs:7
+-#: src/hugin/xrc/main_tool.xrs:9
++#: src/hugin/xrc/main_menu.xrs:7 src/hugin/xrc/main_tool.xrs:9
+ msgid "Save current project file"
+ msgstr "Aktuelles Projekt speichern"
+
+@@ -1870,8 +1861,7 @@
+ msgid "S&ave as"
+ msgstr "Speichern &unter"
+
+-#: src/hugin/xrc/main_menu.xrs:9
+-#: src/hugin/xrc/main_tool.xrs:12
++#: src/hugin/xrc/main_menu.xrs:9 src/hugin/xrc/main_tool.xrs:12
+ msgid "Save current project to a new file"
+ msgstr "Projekt unter neuem Namen speicheren"
+
+@@ -1880,8 +1870,12 @@
+ msgstr "P&TStitcher Skript schreiben"
+
+ #: src/hugin/xrc/main_menu.xrs:11
+-msgid "Write current project to a PTStitcher compatible script file, useful for batch processing"
+-msgstr "Schreibe das aktuelle Projekt in eine PTStitcher kompatible Skriptdatei, nützlich zur Stapelverarbeitung"
++msgid ""
++"Write current project to a PTStitcher compatible script file, useful for "
++"batch processing"
++msgstr ""
++"Schreibe das aktuelle Projekt in eine PTStitcher kompatible Skriptdatei, "
++"nützlich zur Stapelverarbeitung"
+
+ #: src/hugin/xrc/main_menu.xrs:12
+ msgid "&Preferences"
+@@ -1903,8 +1897,7 @@
+ msgid "&Undo"
+ msgstr "&Rückgängig"
+
+-#: src/hugin/xrc/main_menu.xrs:17
+-#: src/hugin/xrc/main_tool.xrs:15
++#: src/hugin/xrc/main_menu.xrs:17 src/hugin/xrc/main_tool.xrs:15
+ msgid "Undo the last action"
+ msgstr "Letzte Aktion rückgängig machen"
+
+@@ -1912,8 +1905,7 @@
+ msgid "&Redo"
+ msgstr "Wieder&herstellen"
+
+-#: src/hugin/xrc/main_menu.xrs:19
+-#: src/hugin/xrc/main_tool.xrs:18
++#: src/hugin/xrc/main_menu.xrs:19 src/hugin/xrc/main_tool.xrs:18
+ msgid "Redo the last action"
+ msgstr "Letzte Aktion wiederherstellen"
+
+@@ -1922,15 +1914,18 @@
+ msgstr "Kontrollpunkt &verfeinern"
+
+ #: src/hugin/xrc/main_menu.xrs:21
+-msgid "Runs fine-tune on all control points. useful for projects created with other tools, like PTGui or PTAssembler"
+-msgstr "Berechnet Verfeinerung für alle Kontrollpunkte. Nützlich für Projekte, die mit anderen Programmen wie PTGui oder PTAssembler erstellt wurden."
++msgid ""
++"Runs fine-tune on all control points. useful for projects created with other "
++"tools, like PTGui or PTAssembler"
++msgstr ""
++"Berechnet Verfeinerung für alle Kontrollpunkte. Nützlich für Projekte, die "
++"mit anderen Programmen wie PTGui oder PTAssembler erstellt wurden."
+
+ #: src/hugin/xrc/main_menu.xrs:22
+ msgid "&Optimize"
+ msgstr "&Optimieren"
+
+-#: src/hugin/xrc/main_menu.xrs:23
+-#: src/hugin/xrc/main_tool.xrs:24
++#: src/hugin/xrc/main_menu.xrs:23 src/hugin/xrc/main_tool.xrs:24
+ msgid "Re-run the optimizer with current settings"
+ msgstr "Nochmals Optimieren mit derzeitigen Einstellungen"
+
+@@ -1938,8 +1933,7 @@
+ msgid "&Add Image"
+ msgstr "&Bilder hinzufügen"
+
+-#: src/hugin/xrc/main_menu.xrs:25
+-#: src/hugin/xrc/main_tool.xrs:21
++#: src/hugin/xrc/main_menu.xrs:25 src/hugin/xrc/main_tool.xrs:21
+ msgid "Add another image to the current project"
+ msgstr "Ein weiteres Bild zum aktuellen Projekt hinzufügen"
+
+@@ -2029,13 +2023,11 @@
+ "Speichern\n"
+ "unter"
+
+-#: src/hugin/xrc/main_tool.xrs:13
+-#: src/hugin/xrc/main_tool.xrs:14
++#: src/hugin/xrc/main_tool.xrs:13 src/hugin/xrc/main_tool.xrs:14
+ msgid "Undo"
+ msgstr "Rückgängig"
+
+-#: src/hugin/xrc/main_tool.xrs:16
+-#: src/hugin/xrc/main_tool.xrs:17
++#: src/hugin/xrc/main_tool.xrs:16 src/hugin/xrc/main_tool.xrs:17
+ msgid "Redo"
+ msgstr ""
+ "Wieder-\n"
+@@ -2057,8 +2049,7 @@
+ msgid "Preview panorama"
+ msgstr "Panorama Vorschau"
+
+-#: src/hugin/xrc/main_tool.xrs:26
+-#: src/hugin/xrc/pref_dialog.xrs:46
++#: src/hugin/xrc/main_tool.xrs:26 src/hugin/xrc/pref_dialog.xrs:46
+ #: src/hugin/xrc/preview_frame.xrs:1
+ msgid "Preview"
+ msgstr "Vorschau"
+@@ -2087,18 +2078,15 @@
+ msgid "Display credits for the creators of Hugin"
+ msgstr "Hugin Ersteller"
+
+-#: src/hugin/xrc/nona_panel.xrs:1
+-#: src/hugin/xrc/ptstitcher_panel.xrs:1
++#: src/hugin/xrc/nona_panel.xrs:1 src/hugin/xrc/ptstitcher_panel.xrs:1
+ msgid "Stitching Options"
+ msgstr "Zusammenfügen Optionen"
+
+-#: src/hugin/xrc/nona_panel.xrs:2
+-#: src/hugin/xrc/ptstitcher_panel.xrs:2
++#: src/hugin/xrc/nona_panel.xrs:2 src/hugin/xrc/ptstitcher_panel.xrs:2
+ msgid "interpolator (i):"
+ msgstr "Interpolation (i):"
+
+-#: src/hugin/xrc/nona_panel.xrs:3
+-#: src/hugin/xrc/ptstitcher_panel.xrs:3
++#: src/hugin/xrc/nona_panel.xrs:3 src/hugin/xrc/ptstitcher_panel.xrs:3
+ msgid "Poly3 (Bicubic)"
+ msgstr "Poly 3 (Bikubisch)"
+
+@@ -2111,36 +2099,34 @@
+ msgstr "Weicher Übergang (erfordert Enblend, nur TIFF Ausgabe)"
+
+ #: src/hugin/xrc/nona_panel.xrs:13
+-msgid "Use the external enblend program for seamless blending. Can only produce TIFF output. Select TIFF to enable this option"
+-msgstr "Für nahtlosen Übergang benutzen sie das externe Programm Enblend. Es kann nur TIFF erzeugen. Wählen sie TIFF um diese Option einzuschalten."
++msgid ""
++"Use the external enblend program for seamless blending. Can only produce "
++"TIFF output. Select TIFF to enable this option"
++msgstr ""
++"Für nahtlosen Übergang benutzen sie das externe Programm Enblend. Es kann "
++"nur TIFF erzeugen. Wählen sie TIFF um diese Option einzuschalten."
+
+-#: src/hugin/xrc/nona_panel.xrs:14
+-#: src/hugin/xrc/ptstitcher_panel.xrs:28
++#: src/hugin/xrc/nona_panel.xrs:14 src/hugin/xrc/ptstitcher_panel.xrs:28
+ msgid "Output File Options"
+ msgstr "Ausgabedateioptionen"
+
+-#: src/hugin/xrc/nona_panel.xrs:15
+-#: src/hugin/xrc/ptstitcher_panel.xrs:29
++#: src/hugin/xrc/nona_panel.xrs:15 src/hugin/xrc/ptstitcher_panel.xrs:29
+ msgid "image format:"
+ msgstr "Bildformat:"
+
+-#: src/hugin/xrc/nona_panel.xrs:16
+-#: src/hugin/xrc/ptstitcher_panel.xrs:30
++#: src/hugin/xrc/nona_panel.xrs:16 src/hugin/xrc/ptstitcher_panel.xrs:30
+ msgid "JPG"
+ msgstr "JPG"
+
+-#: src/hugin/xrc/nona_panel.xrs:17
+-#: src/hugin/xrc/ptstitcher_panel.xrs:31
++#: src/hugin/xrc/nona_panel.xrs:17 src/hugin/xrc/ptstitcher_panel.xrs:31
+ msgid "PNG"
+ msgstr "PNG"
+
+-#: src/hugin/xrc/nona_panel.xrs:18
+-#: src/hugin/xrc/ptstitcher_panel.xrs:32
++#: src/hugin/xrc/nona_panel.xrs:18 src/hugin/xrc/ptstitcher_panel.xrs:32
+ msgid "TIFF"
+ msgstr "TIFF"
+
+-#: src/hugin/xrc/nona_panel.xrs:19
+-#: src/hugin/xrc/ptstitcher_panel.xrs:33
++#: src/hugin/xrc/nona_panel.xrs:19 src/hugin/xrc/ptstitcher_panel.xrs:33
+ msgid "Multiple TIFF"
+ msgstr "Mehrfach TIFF"
+
+@@ -2148,13 +2134,11 @@
+ msgid "Multilayer TIFF"
+ msgstr "Mehrlagen TIFF"
+
+-#: src/hugin/xrc/nona_panel.xrs:21
+-#: src/hugin/xrc/ptstitcher_panel.xrs:44
++#: src/hugin/xrc/nona_panel.xrs:21 src/hugin/xrc/ptstitcher_panel.xrs:44
+ msgid "compression:"
+ msgstr "Kompression:"
+
+-#: src/hugin/xrc/nona_panel.xrs:22
+-#: src/hugin/xrc/ptstitcher_panel.xrs:45
++#: src/hugin/xrc/nona_panel.xrs:22 src/hugin/xrc/ptstitcher_panel.xrs:45
+ msgid "JPEG compression (0-100)"
+ msgstr "JPEG Kompression (0-100)"
+
+@@ -2214,14 +2198,12 @@
+ msgid "yaw (y):"
+ msgstr "Yaw (y)"
+
+-#: src/hugin/xrc/optimize_panel.xrs:15
+-#: src/hugin/xrc/optimize_panel.xrs:18
++#: src/hugin/xrc/optimize_panel.xrs:15 src/hugin/xrc/optimize_panel.xrs:18
+ #: src/hugin/xrc/optimize_panel.xrs:21
+ msgid "select"
+ msgstr "wählen"
+
+-#: src/hugin/xrc/optimize_panel.xrs:16
+-#: src/hugin/xrc/optimize_panel.xrs:19
++#: src/hugin/xrc/optimize_panel.xrs:16 src/hugin/xrc/optimize_panel.xrs:19
+ #: src/hugin/xrc/optimize_panel.xrs:22
+ msgid "clear"
+ msgstr "löschen"
+@@ -2254,8 +2236,7 @@
+ msgid "edit script before optimizing"
+ msgstr "Skript vor der Optimierung bearbeiten"
+
+-#: src/hugin/xrc/optimize_panel.xrs:32
+-#: src/hugin/xrc/ptstitcher_panel.xrs:47
++#: src/hugin/xrc/optimize_panel.xrs:32 src/hugin/xrc/ptstitcher_panel.xrs:47
+ msgid "for advanced users"
+ msgstr "für Fortgeschrittene"
+
+@@ -2363,8 +2344,7 @@
+ msgid "Stitching engine:"
+ msgstr "Stitcher:"
+
+-#: src/hugin/xrc/pano_panel.xrs:27
+-#: src/hugin/xrc/run_stitcher_frame.xrs:1
++#: src/hugin/xrc/pano_panel.xrs:27 src/hugin/xrc/run_stitcher_frame.xrs:1
+ msgid "PTStitcher"
+ msgstr "PTStitcher"
+
+@@ -2376,8 +2356,7 @@
+ msgid "Preferences - hugin"
+ msgstr "Hugin - Voreinstellungen"
+
+-#: src/hugin/xrc/pref_dialog.xrs:2
+-#: src/hugin/xrc/pref_dialog.xrs:11
++#: src/hugin/xrc/pref_dialog.xrs:2 src/hugin/xrc/pref_dialog.xrs:11
+ msgid "Panotools"
+ msgstr "Panotools"
+
+@@ -2389,10 +2368,8 @@
+ msgid "PTStitcher:"
+ msgstr "PTStitcher:"
+
+-#: src/hugin/xrc/pref_dialog.xrs:5
+-#: src/hugin/xrc/pref_dialog.xrs:7
+-#: src/hugin/xrc/pref_dialog.xrs:54
+-#: src/hugin/xrc/pref_dialog.xrs:58
++#: src/hugin/xrc/pref_dialog.xrs:5 src/hugin/xrc/pref_dialog.xrs:7
++#: src/hugin/xrc/pref_dialog.xrs:54 src/hugin/xrc/pref_dialog.xrs:58
+ #: src/hugin/xrc/pref_dialog.xrs:64
+ msgid "..."
+ msgstr "..."
+@@ -2429,8 +2406,7 @@
+ msgid "Patch width:"
+ msgstr "Musterbreite"
+
+-#: src/hugin/xrc/pref_dialog.xrs:16
+-#: src/hugin/xrc/pref_dialog.xrs:20
++#: src/hugin/xrc/pref_dialog.xrs:16 src/hugin/xrc/pref_dialog.xrs:20
+ msgid "pixels"
+ msgstr "Pixel"
+
+@@ -2482,8 +2458,7 @@
+ msgid "Start angle:"
+ msgstr "Startwinkel:"
+
+-#: src/hugin/xrc/pref_dialog.xrs:28
+-#: src/hugin/xrc/pref_dialog.xrs:30
++#: src/hugin/xrc/pref_dialog.xrs:28 src/hugin/xrc/pref_dialog.xrs:30
+ msgid "degrees"
+ msgstr "Grad"
+
+@@ -2561,8 +2536,7 @@
+ msgid "Show Druid (requires restarting hugin)"
+ msgstr "Druide zeigen (Neustart erforderlich)"
+
+-#: src/hugin/xrc/pref_dialog.xrs:48
+-#: src/hugin/xrc/pref_dialog.xrs:56
++#: src/hugin/xrc/pref_dialog.xrs:48 src/hugin/xrc/pref_dialog.xrs:56
+ msgid "Autopano"
+ msgstr "Autopano"
+
+@@ -2582,8 +2556,7 @@
+ msgid "Autopano-SIFT:"
+ msgstr "Autopano-SIFT:"
+
+-#: src/hugin/xrc/pref_dialog.xrs:55
+-#: src/hugin/xrc/pref_dialog.xrs:59
++#: src/hugin/xrc/pref_dialog.xrs:55 src/hugin/xrc/pref_dialog.xrs:59
+ msgid "Arguments:"
+ msgstr "Argumente:"
+
+@@ -2630,21 +2603,15 @@
+ msgid "Delete remapped tiff files"
+ msgstr "Umgerechnete TIFF Bilder löschen."
+
+-#: src/hugin/xrc/pref_dialog.xrs:68
+-msgid "Ok"
+-msgstr "Ok"
+-
+ #: src/hugin/xrc/pref_dialog.xrs:71
+ msgid "Load Defaults"
+ msgstr "Voreinstellungen laden"
+
+-#: src/hugin/xrc/preview_frame.xrs:2
+-#: src/hugin/xrc/preview_frame.xrs:9
++#: src/hugin/xrc/preview_frame.xrs:2 src/hugin/xrc/preview_frame.xrs:9
+ msgid "Center"
+ msgstr "Hauptpunkt auswählen"
+
+-#: src/hugin/xrc/preview_frame.xrs:3
+-#: src/hugin/xrc/preview_frame.xrs:8
++#: src/hugin/xrc/preview_frame.xrs:3 src/hugin/xrc/preview_frame.xrs:8
+ msgid "Center the preview horizontally"
+ msgstr "Vorschau horizontal zentrieren"
+
+@@ -2656,13 +2623,11 @@
+ msgid "Automatically update preview on relevant changes"
+ msgstr "Vorschau automatisch aktualisieren"
+
+-#: src/hugin/xrc/preview_frame.xrs:6
+-#: src/hugin/xrc/preview_frame.xrs:16
++#: src/hugin/xrc/preview_frame.xrs:6 src/hugin/xrc/preview_frame.xrs:16
+ msgid "Update"
+ msgstr "Aktualisieren"
+
+-#: src/hugin/xrc/preview_frame.xrs:7
+-#: src/hugin/xrc/preview_frame.xrs:15
++#: src/hugin/xrc/preview_frame.xrs:7 src/hugin/xrc/preview_frame.xrs:15
+ msgid "Update preview"
+ msgstr "Vorschau aktualisieren"
+
+@@ -2698,8 +2663,7 @@
+ msgid "Show none of the images"
+ msgstr "Kein Bild zeigen"
+
+-#: src/hugin/xrc/preview_frame.xrs:20
+-#: src/hugin/xrc/ptstitcher_panel.xrs:14
++#: src/hugin/xrc/preview_frame.xrs:20 src/hugin/xrc/ptstitcher_panel.xrs:14
+ #: src/hugin/xrc/ptstitcher_panel.xrs:24
+ msgid "None"
+ msgstr "Nichts"
+@@ -2761,8 +2725,12 @@
+ msgstr "Medium (1)"
+
+ #: src/hugin/xrc/ptstitcher_panel.xrs:27
+-msgid "approximate remapping, faster but slightly less accurate. Fast should work well with usual panos, Medium even with morphed panos"
+-msgstr "Neuzusammensetzen einschätzen. Schneller, aber weniger genau. Schneller müßte für normale Panoramen funktionieren, Medium für verzerrten Panoramen."
++msgid ""
++"approximate remapping, faster but slightly less accurate. Fast should work "
++"well with usual panos, Medium even with morphed panos"
++msgstr ""
++"Neuzusammensetzen einschätzen. Schneller, aber weniger genau. Schneller "
++"müßte für normale Panoramen funktionieren, Medium für verzerrten Panoramen."
+
+ #: src/hugin/xrc/ptstitcher_panel.xrs:34
+ msgid "Multiple TIFF with masks"
+@@ -2823,4 +2791,3 @@
+ #: src/hugin/xrc/run_stitcher_frame.xrs:3
+ msgid "Abort"
+ msgstr "Abbrechen"
+-
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/po/fr.po hugin/src/hugin/po/fr.po
+--- hugin-0.5-beta4/src/hugin/po/fr.po 2005-03-08 22:10:48.000000000 +0100
++++ hugin/src/hugin/po/fr.po 2005-04-26 13:06:00.000000000 +0200
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: fr\n"
+ "Report-Msgid-Bugs-To: pablo.dangelo@web.de\n"
+-"POT-Creation-Date: 2005-03-08 21:37+0100\n"
++"POT-Creation-Date: 2005-04-26 12:54+0300\n"
+ "PO-Revision-Date: 2005-02-12 11:51+0100\n"
+ "Last-Translator: <jean-luc.coulon@wanadoo.fr>\n"
+ "Language-Team: <en@li.org>\n"
+@@ -17,69 +17,74 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ #, c-format
+ msgid "Added %d control points"
+ msgstr "%d points de contrôle ont été ajoutés"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ msgid "Autopano result"
+ msgstr "Résultat d'Autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:102
++#: src/hugin/AutoCtrlPointCreator.cpp:107
+ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+ msgstr ""
+ "Autopano (version 1.03 ou supérieure), voir le site http://autopano.kolor.com"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:103
++#: src/hugin/AutoCtrlPointCreator.cpp:108
+ msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+ msgstr ""
+ "Autopano-Sift, voir le site http://user.cs.tu-berlin.de/~nowozin/autopano-"
+ "sift/"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Choose which autopano program should be used\n"
+ msgstr "Choisir quel programme autopano doit être utilisé\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Select autopano type"
+ msgstr "Sélectionner le type d'autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:144
+-#: src/hugin/AutoCtrlPointCreator.cpp:331
++#: src/hugin/AutoCtrlPointCreator.cpp:149
++#: src/hugin/AutoCtrlPointCreator.cpp:393
+ msgid "Select autopano program / frontend script"
+ msgstr "Choisir le programme autopano / script frontal"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:175
++#: src/hugin/AutoCtrlPointCreator.cpp:151 src/hugin/PreferencesDialog.cpp:175
+ #: src/hugin/PreferencesDialog.cpp:191 src/hugin/PreferencesDialog.cpp:207
+-#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:110
++#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:111
+ #: src/hugin/RunStitcherFrame.cpp:89
+ msgid "Executables (*.exe)|*.exe"
+ msgstr "Exécutables (*.exe)|*.exe"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:152
+-#: src/hugin/AutoCtrlPointCreator.cpp:167
+-#: src/hugin/AutoCtrlPointCreator.cpp:339
++#: src/hugin/AutoCtrlPointCreator.cpp:157
++#: src/hugin/AutoCtrlPointCreator.cpp:209
++#: src/hugin/AutoCtrlPointCreator.cpp:401
+ msgid "No autopano selected"
+ msgstr "Pas d'autopano sélectionné"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:159
+-msgid "Select autopano-sift frontend script"
++#: src/hugin/AutoCtrlPointCreator.cpp:201
++#, fuzzy
++msgid "Select autopano frontend script"
+ msgstr "Sélectionner le script frontal d'autopano-sift"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:205
++#: src/hugin/AutoCtrlPointCreator.cpp:203
++msgid "Shell Scripts (*.sh)|*.sh"
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:248
+ #, c-format
+ msgid "Please use either %namefile or %i in the autopano-sift command line."
+ msgstr ""
+ "Veuillez entrer soit %namefile soit %i sur la ligne de commande d'autopano-"
+ "sift."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:206
+-#: src/hugin/AutoCtrlPointCreator.cpp:211
++#: src/hugin/AutoCtrlPointCreator.cpp:249
++#: src/hugin/AutoCtrlPointCreator.cpp:254
+ msgid "Error in Autopano command"
+ msgstr "Erreur dans la commande Autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:210
++#: src/hugin/AutoCtrlPointCreator.cpp:253
+ #, c-format
+ msgid ""
+ "Please use %namefile or %i to specify the input files for autopano-sift"
+@@ -87,8 +92,18 @@
+ "Veuillez utiliser %namefile ou %i pour préciser les fichiers d'entrée "
+ "d'autopano-sift"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:243
+-#: src/hugin/AutoCtrlPointCreator.cpp:377
++#: src/hugin/AutoCtrlPointCreator.cpp:288
++#, fuzzy
++msgid "Select autopano .Net executable."
++msgstr "Sélectionner le type d'autopano"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:297
++#, fuzzy
++msgid "No autopano directory selected"
++msgstr "Pas d'autopano sélectionné"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:305
++#: src/hugin/AutoCtrlPointCreator.cpp:439
+ msgid ""
+ "autopano command line too long.\n"
+ "This is a windows limitation\n"
+@@ -100,18 +115,18 @@
+ "Veuillez sélectionner moins d'images ou placez les images\n"
+ "dans un dossier avec un chemin plus court."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:244
+-#: src/hugin/AutoCtrlPointCreator.cpp:378 src/hugin/NonaStitcherPanel.cpp:348
++#: src/hugin/AutoCtrlPointCreator.cpp:306
++#: src/hugin/AutoCtrlPointCreator.cpp:440 src/hugin/NonaStitcherPanel.cpp:350
+ msgid "Too many images selected"
+ msgstr "Trop d'images ont été sélectionnées"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid "Running autopano"
+ msgstr "Lancement d'autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid ""
+ "Please wait while autopano searches control points\n"
+ "See the command window for autopanos' progress"
+@@ -120,31 +135,31 @@
+ "Vous pouvez suivre l'évolution du travail d'autopano dans la fenêtre de "
+ "commande"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:400 src/hugin/NonaStitcherPanel.cpp:388
+-#: src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:344
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:462 src/hugin/NonaStitcherPanel.cpp:392
++#: src/hugin/NonaStitcherPanel.cpp:401
+ msgid "Could not execute command: "
+ msgstr "Impossible d'exécuter la commande : "
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
++#: src/hugin/AutoCtrlPointCreator.cpp:344
+ msgid "ShellExecuteEx failed"
+ msgstr "Échec de ShellExecuteEx"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:300
+-#: src/hugin/AutoCtrlPointCreator.cpp:400
+-#: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:362
++#: src/hugin/AutoCtrlPointCreator.cpp:462
++#: src/hugin/AutoCtrlPointCreator.cpp:468 src/hugin/NonaStitcherPanel.cpp:401
+ msgid "wxExecute Error"
+ msgstr "Erreur wxExecute"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:298
+-#: src/hugin/AutoCtrlPointCreator.cpp:404 src/hugin/NonaStitcherPanel.cpp:399
++#: src/hugin/AutoCtrlPointCreator.cpp:360
++#: src/hugin/AutoCtrlPointCreator.cpp:466 src/hugin/NonaStitcherPanel.cpp:404
+ msgid "command: "
+ msgstr "commande : "
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:299
+-#: src/hugin/AutoCtrlPointCreator.cpp:405 src/hugin/NonaStitcherPanel.cpp:400
++#: src/hugin/AutoCtrlPointCreator.cpp:361
++#: src/hugin/AutoCtrlPointCreator.cpp:467 src/hugin/NonaStitcherPanel.cpp:405
+ msgid ""
+ "\n"
+ "failed with error code: "
+@@ -152,13 +167,13 @@
+ "\n"
+ "a échoué avec un code erreur : "
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid "Could not open "
+ msgstr "Impossible d'ouvrir "
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid ""
+ " for reading\n"
+ "This is an indicator that the autopano call failed,\n"
+@@ -172,16 +187,16 @@
+ "\n"
+ "Commande autopano : "
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:307
+-#: src/hugin/AutoCtrlPointCreator.cpp:416
++#: src/hugin/AutoCtrlPointCreator.cpp:369
++#: src/hugin/AutoCtrlPointCreator.cpp:478
+ msgid "autopano failure"
+ msgstr "Échec d'autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:333 src/hugin/PreferencesDialog.cpp:239
++#: src/hugin/AutoCtrlPointCreator.cpp:395 src/hugin/PreferencesDialog.cpp:239
+ msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+ msgstr "Exécutables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:414
++#: src/hugin/AutoCtrlPointCreator.cpp:476
+ msgid ""
+ "\n"
+ " current directory:"
+@@ -228,27 +243,27 @@
+ msgid "Distance"
+ msgstr "Distance"
+
+-#: src/hugin/CPEditorPanel.cpp:406
++#: src/hugin/CPEditorPanel.cpp:405
+ msgid "No corresponding point found"
+ msgstr "Aucun point de correspondance n'a été trouvé"
+
+-#: src/hugin/CPEditorPanel.cpp:475
++#: src/hugin/CPEditorPanel.cpp:474
+ msgid "new control point added"
+ msgstr "Un nouveau point de contrôle a été ajouté"
+
+-#: src/hugin/CPEditorPanel.cpp:575 src/hugin/CPEditorPanel.cpp:781
++#: src/hugin/CPEditorPanel.cpp:574 src/hugin/CPEditorPanel.cpp:780
+ msgid "searching similar point..."
+ msgstr "Recherche d'un point similaire..."
+
+-#: src/hugin/CPEditorPanel.cpp:594 src/hugin/CPEditorPanel.cpp:709
++#: src/hugin/CPEditorPanel.cpp:593 src/hugin/CPEditorPanel.cpp:708
+ msgid "Error during Fine-tune"
+ msgstr "Erreur lors de l'ajustement précis"
+
+-#: src/hugin/CPEditorPanel.cpp:625
++#: src/hugin/CPEditorPanel.cpp:624
+ msgid "Estimated point outside image"
+ msgstr "Le point estimé est en dehors de l'image"
+
+-#: src/hugin/CPEditorPanel.cpp:827
++#: src/hugin/CPEditorPanel.cpp:826
+ #, c-format
+ msgid ""
+ "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
+@@ -257,7 +272,7 @@
+ "Point ajusté précisément, angle : %.0f deg, coefficient de corrélation : %"
+ "0.3f, courbure %0.3f %0.3f"
+
+-#: src/hugin/CPEditorPanel.cpp:833
++#: src/hugin/CPEditorPanel.cpp:832
+ #, c-format
+ msgid ""
+ "No similar point found.\n"
+@@ -268,36 +283,36 @@
+ "coefficient de corrélation : %.3f, (devrait être > % .3f)\n"
+ "courbure du pic : (%.3f, %.3f), (devrait être > %.3f)"
+
+-#: src/hugin/CPEditorPanel.cpp:835
++#: src/hugin/CPEditorPanel.cpp:834
+ msgid "No similar point found"
+ msgstr "Aucun point semblable n'a été trouvé"
+
+-#: src/hugin/CPEditorPanel.cpp:1151 src/hugin/CPListFrame.cpp:402
++#: src/hugin/CPEditorPanel.cpp:1150 src/hugin/CPListFrame.cpp:402
+ #: src/hugin/PreviewFrame.cpp:156 src/hugin/xrc/cp_editor_panel.xrs:24
+ msgid "normal"
+ msgstr "normal"
+
+-#: src/hugin/CPEditorPanel.cpp:1154 src/hugin/CPListFrame.cpp:405
++#: src/hugin/CPEditorPanel.cpp:1153 src/hugin/CPListFrame.cpp:405
+ msgid "vert. Line"
+ msgstr "ligne vert."
+
+-#: src/hugin/CPEditorPanel.cpp:1157 src/hugin/CPListFrame.cpp:408
++#: src/hugin/CPEditorPanel.cpp:1156 src/hugin/CPListFrame.cpp:408
+ msgid "horiz. Line"
+ msgstr "ligne horiz."
+
+-#: src/hugin/CPEditorPanel.cpp:1412
++#: src/hugin/CPEditorPanel.cpp:1411
+ msgid "Cannot estimate image position without control points"
+ msgstr "Impossible d'estimer la position de l'image sans point de contrôle"
+
+-#: src/hugin/CPEditorPanel.cpp:1603
++#: src/hugin/CPEditorPanel.cpp:1602
+ msgid "Select Point in right image"
+ msgstr "Sélectionner un point sur l'image de droite"
+
+-#: src/hugin/CPEditorPanel.cpp:1615
++#: src/hugin/CPEditorPanel.cpp:1614
+ msgid "Select Point in left image"
+ msgstr "Sélectionner un point sur l'image de gauche"
+
+-#: src/hugin/CPEditorPanel.cpp:1634
++#: src/hugin/CPEditorPanel.cpp:1633
+ msgid "change points, or press right mouse button to add the pair"
+ msgstr ""
+ "modifier les points ou presser le bouton droit de la souris pour ajouter la "
+@@ -402,6 +417,15 @@
+ msgid "Always center Crop on d,e"
+ msgstr ""
+
++#: src/hugin/ImageCenter.cpp:105 src/hugin/xrc/pref_dialog.xrs:68
++msgid "Ok"
++msgstr "Valider"
++
++#: src/hugin/ImageCenter.cpp:110 src/hugin/RunOptimizerFrame.cpp:310
++#: src/hugin/xrc/edit_text.xrs:3 src/hugin/xrc/pref_dialog.xrs:70
++msgid "Cancel"
++msgstr "Abandonner"
++
+ #: src/hugin/ImageCenter.cpp:207 src/hugin/ImageCenter.cpp:222
+ #: src/hugin/ImageCenter.cpp:237 src/hugin/ImageCenter.cpp:252
+ #, fuzzy
+@@ -510,55 +534,55 @@
+ msgid "Equirectangular"
+ msgstr "Equirectangulaire"
+
+-#: src/hugin/ImagesPanel.cpp:271 src/hugin/ImagesPanel.cpp:292
+-#: src/hugin/ImagesPanel.cpp:312
++#: src/hugin/ImagesPanel.cpp:270 src/hugin/ImagesPanel.cpp:291
++#: src/hugin/ImagesPanel.cpp:311
+ msgid "Value must be numeric."
+ msgstr "La valeur doit être numérique."
+
+-#: src/hugin/ImagesPanel.cpp:563
++#: src/hugin/ImagesPanel.cpp:562
+ #, c-format
+ msgid "Really Delete %d control points?"
+ msgstr "Voulez-vous vraiment supprimer %d points de contrôle ?"
+
+-#: src/hugin/ImagesPanel.cpp:565
++#: src/hugin/ImagesPanel.cpp:564
+ msgid "Delete Control Points"
+ msgstr "Effacer les points de contrôle"
+
+-#: src/hugin/LensPanel.cpp:649
++#: src/hugin/LensPanel.cpp:650
+ msgid "Not a jpeg file:"
+ msgstr "Ce n'est pas un fichier jpeg :"
+
+-#: src/hugin/LensPanel.cpp:654 src/hugin/LensPanel.cpp:708
+-#: src/hugin/LensPanel.cpp:784 src/hugin/LensPanel.cpp:800
+-#: src/hugin/LensPanel.cpp:818
++#: src/hugin/LensPanel.cpp:655 src/hugin/LensPanel.cpp:709
++#: src/hugin/LensPanel.cpp:785 src/hugin/LensPanel.cpp:801
++#: src/hugin/LensPanel.cpp:819
+ msgid "Please select an image and try again"
+ msgstr "Veuillez sélectionner une image et réessayer"
+
+-#: src/hugin/LensPanel.cpp:672
++#: src/hugin/LensPanel.cpp:673
+ msgid "Save lens parameters file"
+ msgstr "Enregistrer le fichier des paramètres de l'objectif"
+
+-#: src/hugin/LensPanel.cpp:674 src/hugin/LensPanel.cpp:724
++#: src/hugin/LensPanel.cpp:675 src/hugin/LensPanel.cpp:725
+ msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
+ msgstr "Fichiers Projet d'objectifs (*.ini)|*.ini|tous les fichiers (*.*)|*.*"
+
+-#: src/hugin/LensPanel.cpp:722
++#: src/hugin/LensPanel.cpp:723
+ msgid "Load lens parameters"
+ msgstr "Charger les paramètres de l'objectif"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Enter new lens number"
+ msgstr "Entrer le numéro du nouvel objectif"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Lens number"
+ msgstr "Objectif numéo"
+
+-#: src/hugin/LensPanel.cpp:809
++#: src/hugin/LensPanel.cpp:810
+ msgid "Change lens number"
+ msgstr "Changer le numéro d'objectif"
+
+-#: src/hugin/LensPanel.cpp:833
++#: src/hugin/LensPanel.cpp:834
+ msgid ""
+ "Enter Crop Factor for image\n"
+ "\n"
+@@ -574,7 +598,7 @@
+ "\n"
+ "où « diagonale » est la diagonale (en mm) du film ou du capteur."
+
+-#: src/hugin/LensPanel.cpp:834
++#: src/hugin/LensPanel.cpp:835
+ msgid "Adding Image"
+ msgstr "Ajout d'une image"
+
+@@ -608,44 +632,54 @@
+ msgid "forced close"
+ msgstr "Fermeture forcée"
+
+-#: src/hugin/MainFrame.cpp:491
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "No images - Nothing to do"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "Warning"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:495
+ #, c-format
+ msgid "saved project %s"
+ msgstr "Projet %s enregistré"
+
+-#: src/hugin/MainFrame.cpp:500
++#: src/hugin/MainFrame.cpp:508
+ msgid "Save project file"
+ msgstr "Enregistrer le fichier de projet"
+
+-#: src/hugin/MainFrame.cpp:502
++#: src/hugin/MainFrame.cpp:510
+ msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*"
+ msgstr "Fichiers de projets (*.pto)|*.pto|Tous les fichiers (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:515
++#: src/hugin/MainFrame.cpp:527
+ msgid "Save PTStitcher script file"
+ msgstr "Enregistrer le fichier script PTStitcher"
+
+-#: src/hugin/MainFrame.cpp:517
++#: src/hugin/MainFrame.cpp:529
+ msgid "PTStitcher files (*.txt)|*.txt"
+ msgstr "Fichiers PTStitcher (*.txt)|*.txt"
+
+-#: src/hugin/MainFrame.cpp:543
++#: src/hugin/MainFrame.cpp:555
+ msgid "Open project: "
+ msgstr "Ouverture du projet : "
+
+-#: src/hugin/MainFrame.cpp:555
++#: src/hugin/MainFrame.cpp:567
+ msgid "Project opened"
+ msgstr "Projet ouvert"
+
+-#: src/hugin/MainFrame.cpp:565
++#: src/hugin/MainFrame.cpp:577
+ msgid "Error opening project: "
+ msgstr "Erreur lors de l'ouverture du projet : "
+
+-#: src/hugin/MainFrame.cpp:583
++#: src/hugin/MainFrame.cpp:595
+ msgid "Open project file"
+ msgstr "Ouverture du fichier de projet"
+
+-#: src/hugin/MainFrame.cpp:585
++#: src/hugin/MainFrame.cpp:597
+ msgid ""
+ "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
+ "(*.*)|*.*"
+@@ -653,11 +687,11 @@
+ "Fichiers de Projet (*.pto,*.ptp,*.pts,*oto)|*.pto;*ptp;*.pts;*.oto;|Tous les "
+ "fichiers (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:593
++#: src/hugin/MainFrame.cpp:605
+ msgid "Open project: cancel"
+ msgstr "Ouverture du projet : abandon"
+
+-#: src/hugin/MainFrame.cpp:615 src/include/hugin/wxPanoCommand.h:169
++#: src/hugin/MainFrame.cpp:627 src/include/hugin/wxPanoCommand.h:169
+ msgid ""
+ "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files "
+ "(*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
+@@ -665,27 +699,27 @@
+ "Fichiers image (*.jpg)|*.jpg;*.JPG|Fichiers image (*.png);*.png;*.PNG|"
+ "Fichiers image (*.tif)|*.tif;*.TIF|Tous les fichiers (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:616 src/include/hugin/wxPanoCommand.h:170
++#: src/hugin/MainFrame.cpp:628 src/include/hugin/wxPanoCommand.h:170
+ msgid "Add images"
+ msgstr "Ajouter des images"
+
+-#: src/hugin/MainFrame.cpp:660
++#: src/hugin/MainFrame.cpp:672
+ msgid "Add Image: cancel"
+ msgstr "Ajout d'images : abandon"
+
+-#: src/hugin/MainFrame.cpp:985
++#: src/hugin/MainFrame.cpp:997
+ msgid "hugin - FAQ"
+ msgstr "Hugin - FAQ"
+
+-#: src/hugin/MainFrame.cpp:1064
++#: src/hugin/MainFrame.cpp:1076
+ msgid "Fine-tuning all points"
+ msgstr "Ajuster précisément tous les points"
+
+-#: src/hugin/MainFrame.cpp:1066
++#: src/hugin/MainFrame.cpp:1078
+ msgid "Finetuning"
+ msgstr "Ajustement précis"
+
+-#: src/hugin/MainFrame.cpp:1150
++#: src/hugin/MainFrame.cpp:1162
+ #, c-format
+ msgid ""
+ "%d points fine-tuned, %d points not updated due to low correlation\n"
+@@ -714,7 +748,7 @@
+ "Utiliser la liste des points de contrôle (F3) pour afficher tous les points "
+ "du projet actuel.\n"
+
+-#: src/hugin/MainFrame.cpp:1152
++#: src/hugin/MainFrame.cpp:1164
+ msgid "Fine-tune result"
+ msgstr "Résultat de l'ajustement précis"
+
+@@ -757,7 +791,7 @@
+ msgid "No enblend commandline tool selected"
+ msgstr "Aucun outil en ligne de commande enblend sélectionné"
+
+-#: src/hugin/NonaStitcherPanel.cpp:347
++#: src/hugin/NonaStitcherPanel.cpp:349
+ msgid ""
+ "Can not call enblend with a command line > 2000 characters.\n"
+ "This is a Windows limitiation\n"
+@@ -770,11 +804,11 @@
+ "veuillez utiliser moins d'images ou placez les images dans un dossier\n"
+ "dont le chemin est plus court."
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid "Running Enblend"
+ msgstr "Lancement d'Enblend"
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid ""
+ "Enblend will take a while to finish processing the panorama\n"
+ "You can watch the enblend progress in the command window"
+@@ -783,7 +817,7 @@
+ "panorama\n"
+ "Vous pouvez suivre la progression d'enblend dans la fenêtre de lancement."
+
+-#: src/hugin/NonaStitcherPanel.cpp:359
++#: src/hugin/NonaStitcherPanel.cpp:363
+ msgid ""
+ "Could not execute enblend, system() failed: \n"
+ "Command was :"
+@@ -791,15 +825,15 @@
+ "Impossible d'exécuter enblend, system() a échoué :\n"
+ "La commande était :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:360
++#: src/hugin/NonaStitcherPanel.cpp:364
+ msgid "Error returned was :"
+ msgstr "L'erreur retournée a été :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:388
++#: src/hugin/NonaStitcherPanel.cpp:392
+ msgid "CreateProcess Error"
+ msgstr "Erreur de CreateProcess"
+
+-#: src/hugin/NonaStitcherPanel.cpp:401
++#: src/hugin/NonaStitcherPanel.cpp:406
+ msgid "enblend error"
+ msgstr "Erreur d'enblend"
+
+@@ -993,7 +1027,7 @@
+ msgid "width needs to be an integer bigger than 0"
+ msgstr "la largeur doit être un nombre positif"
+
+-#: src/hugin/PanoPanel.cpp:502
++#: src/hugin/PanoPanel.cpp:506
+ msgid "Create panorama image"
+ msgstr "Créer une image panoramique"
+
+@@ -1029,7 +1063,8 @@
+ msgid "Select PTStitcher"
+ msgstr "Sélectionner PTStitcher"
+
+-#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:108
++#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:109
++#: src/hugin/RunOptimizerFrame.cpp:123
+ msgid "Select PTOptimizer"
+ msgstr "Sélectionner PTOptimizer"
+
+@@ -1169,33 +1204,33 @@
+ msgid "PTStitcher note"
+ msgstr "Note de PTStitcher"
+
+-#: src/hugin/RunOptimizerFrame.cpp:116
++#: src/hugin/RunOptimizerFrame.cpp:117
+ msgid "No PTOptimizer.exe selected"
+ msgstr "PTOptimizer.exe n'a pas été sélectionné"
+
+-#: src/hugin/RunOptimizerFrame.cpp:140
++#: src/hugin/RunOptimizerFrame.cpp:131
++#, fuzzy
++msgid "No PTOptimizer selected"
++msgstr "PTOptimizer.exe n'a pas été sélectionné"
++
++#: src/hugin/RunOptimizerFrame.cpp:155
+ msgid "Failed to launch PTOptimizer."
+ msgstr "Échec du lancement de PTOptimizer."
+
+-#: src/hugin/RunOptimizerFrame.cpp:151
++#: src/hugin/RunOptimizerFrame.cpp:166
+ msgid "Could not obtain PTOptimizer output"
+ msgstr "Impossible de récupérer la sortie de PTOptimizer"
+
+-#: src/hugin/RunOptimizerFrame.cpp:161
++#: src/hugin/RunOptimizerFrame.cpp:176
+ msgid "Stop"
+ msgstr "Arrêt"
+
+-#: src/hugin/RunOptimizerFrame.cpp:223
++#: src/hugin/RunOptimizerFrame.cpp:238
+ #, c-format
+ msgid "Strategy %d, Iteration %d, average distance: %f"
+ msgstr "Stratégie %d, itération %d, distance moyenne %f"
+
+-#: src/hugin/RunOptimizerFrame.cpp:295 src/hugin/xrc/edit_text.xrs:3
+-#: src/hugin/xrc/pref_dialog.xrs:70
+-msgid "Cancel"
+-msgstr "Abandonner"
+-
+-#: src/hugin/RunOptimizerFrame.cpp:327
++#: src/hugin/RunOptimizerFrame.cpp:342
+ msgid ""
+ "Optimizer run finished.\n"
+ "WARNING: a very small Field of View (v) has been estimated\n"
+@@ -1219,7 +1254,7 @@
+ "partiels\n"
+ "lorsque les images sont déjà alignées correctement."
+
+-#: src/hugin/RunOptimizerFrame.cpp:329
++#: src/hugin/RunOptimizerFrame.cpp:344
+ #, c-format
+ msgid ""
+ "Optimizer run finished.\n"
+@@ -2584,10 +2619,6 @@
+ msgid "Delete remapped tiff files"
+ msgstr ""
+
+-#: src/hugin/xrc/pref_dialog.xrs:68
+-msgid "Ok"
+-msgstr "Valider"
+-
+ #: src/hugin/xrc/pref_dialog.xrs:71
+ msgid "Load Defaults"
+ msgstr "Chargement des valeurs par défaut"
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/po/hugin.pot hugin/src/hugin/po/hugin.pot
+--- hugin-0.5-beta4/src/hugin/po/hugin.pot 2005-03-08 22:10:49.000000000 +0100
++++ hugin/src/hugin/po/hugin.pot 2005-04-26 13:06:01.000000000 +0200
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: pablo.dangelo@web.de\n"
+-"POT-Creation-Date: 2005-03-08 21:37+0100\n"
++"POT-Creation-Date: 2005-04-26 12:54+0300\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+@@ -16,71 +16,83 @@
+ "Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ #, c-format
+ msgid "Added %d control points"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ msgid "Autopano result"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:102
++#: src/hugin/AutoCtrlPointCreator.cpp:107
+ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:103
++#: src/hugin/AutoCtrlPointCreator.cpp:108
+ msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Choose which autopano program should be used\n"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Select autopano type"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:144
+-#: src/hugin/AutoCtrlPointCreator.cpp:331
++#: src/hugin/AutoCtrlPointCreator.cpp:149
++#: src/hugin/AutoCtrlPointCreator.cpp:393
+ msgid "Select autopano program / frontend script"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:175
++#: src/hugin/AutoCtrlPointCreator.cpp:151 src/hugin/PreferencesDialog.cpp:175
+ #: src/hugin/PreferencesDialog.cpp:191 src/hugin/PreferencesDialog.cpp:207
+-#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:110
++#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:111
+ #: src/hugin/RunStitcherFrame.cpp:89
+ msgid "Executables (*.exe)|*.exe"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:152
+-#: src/hugin/AutoCtrlPointCreator.cpp:167
+-#: src/hugin/AutoCtrlPointCreator.cpp:339
++#: src/hugin/AutoCtrlPointCreator.cpp:157
++#: src/hugin/AutoCtrlPointCreator.cpp:209
++#: src/hugin/AutoCtrlPointCreator.cpp:401
+ msgid "No autopano selected"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:159
+-msgid "Select autopano-sift frontend script"
++#: src/hugin/AutoCtrlPointCreator.cpp:201
++msgid "Select autopano frontend script"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:205
++#: src/hugin/AutoCtrlPointCreator.cpp:203
++msgid "Shell Scripts (*.sh)|*.sh"
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:248
+ #, c-format
+ msgid "Please use either %namefile or %i in the autopano-sift command line."
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:206
+-#: src/hugin/AutoCtrlPointCreator.cpp:211
++#: src/hugin/AutoCtrlPointCreator.cpp:249
++#: src/hugin/AutoCtrlPointCreator.cpp:254
+ msgid "Error in Autopano command"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:210
++#: src/hugin/AutoCtrlPointCreator.cpp:253
+ #, c-format
+ msgid ""
+ "Please use %namefile or %i to specify the input files for autopano-sift"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:243
+-#: src/hugin/AutoCtrlPointCreator.cpp:377
++#: src/hugin/AutoCtrlPointCreator.cpp:288
++msgid "Select autopano .Net executable."
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:297
++msgid "No autopano directory selected"
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:305
++#: src/hugin/AutoCtrlPointCreator.cpp:439
+ msgid ""
+ "autopano command line too long.\n"
+ "This is a windows limitation\n"
+@@ -88,60 +100,60 @@
+ "a shorter pathname"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:244
+-#: src/hugin/AutoCtrlPointCreator.cpp:378 src/hugin/NonaStitcherPanel.cpp:348
++#: src/hugin/AutoCtrlPointCreator.cpp:306
++#: src/hugin/AutoCtrlPointCreator.cpp:440 src/hugin/NonaStitcherPanel.cpp:350
+ msgid "Too many images selected"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid "Running autopano"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid ""
+ "Please wait while autopano searches control points\n"
+ "See the command window for autopanos' progress"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:400 src/hugin/NonaStitcherPanel.cpp:388
+-#: src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:344
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:462 src/hugin/NonaStitcherPanel.cpp:392
++#: src/hugin/NonaStitcherPanel.cpp:401
+ msgid "Could not execute command: "
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
++#: src/hugin/AutoCtrlPointCreator.cpp:344
+ msgid "ShellExecuteEx failed"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:300
+-#: src/hugin/AutoCtrlPointCreator.cpp:400
+-#: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:362
++#: src/hugin/AutoCtrlPointCreator.cpp:462
++#: src/hugin/AutoCtrlPointCreator.cpp:468 src/hugin/NonaStitcherPanel.cpp:401
+ msgid "wxExecute Error"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:298
+-#: src/hugin/AutoCtrlPointCreator.cpp:404 src/hugin/NonaStitcherPanel.cpp:399
++#: src/hugin/AutoCtrlPointCreator.cpp:360
++#: src/hugin/AutoCtrlPointCreator.cpp:466 src/hugin/NonaStitcherPanel.cpp:404
+ msgid "command: "
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:299
+-#: src/hugin/AutoCtrlPointCreator.cpp:405 src/hugin/NonaStitcherPanel.cpp:400
++#: src/hugin/AutoCtrlPointCreator.cpp:361
++#: src/hugin/AutoCtrlPointCreator.cpp:467 src/hugin/NonaStitcherPanel.cpp:405
+ msgid ""
+ "\n"
+ "failed with error code: "
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid "Could not open "
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid ""
+ " for reading\n"
+ "This is an indicator that the autopano call failed,\n"
+@@ -150,16 +162,16 @@
+ "Autopano command: "
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:307
+-#: src/hugin/AutoCtrlPointCreator.cpp:416
++#: src/hugin/AutoCtrlPointCreator.cpp:369
++#: src/hugin/AutoCtrlPointCreator.cpp:478
+ msgid "autopano failure"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:333 src/hugin/PreferencesDialog.cpp:239
++#: src/hugin/AutoCtrlPointCreator.cpp:395 src/hugin/PreferencesDialog.cpp:239
+ msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+ msgstr ""
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:414
++#: src/hugin/AutoCtrlPointCreator.cpp:476
+ msgid ""
+ "\n"
+ " current directory:"
+@@ -204,34 +216,34 @@
+ msgid "Distance"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:406
++#: src/hugin/CPEditorPanel.cpp:405
+ msgid "No corresponding point found"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:475
++#: src/hugin/CPEditorPanel.cpp:474
+ msgid "new control point added"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:575 src/hugin/CPEditorPanel.cpp:781
++#: src/hugin/CPEditorPanel.cpp:574 src/hugin/CPEditorPanel.cpp:780
+ msgid "searching similar point..."
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:594 src/hugin/CPEditorPanel.cpp:709
++#: src/hugin/CPEditorPanel.cpp:593 src/hugin/CPEditorPanel.cpp:708
+ msgid "Error during Fine-tune"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:625
++#: src/hugin/CPEditorPanel.cpp:624
+ msgid "Estimated point outside image"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:827
++#: src/hugin/CPEditorPanel.cpp:826
+ #, c-format
+ msgid ""
+ "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
+ "%0.3f %0.3f "
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:833
++#: src/hugin/CPEditorPanel.cpp:832
+ #, c-format
+ msgid ""
+ "No similar point found.\n"
+@@ -239,36 +251,36 @@
+ "peak curvature: (%.3f, %.3f) ( should be > %.3f)"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:835
++#: src/hugin/CPEditorPanel.cpp:834
+ msgid "No similar point found"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1151 src/hugin/CPListFrame.cpp:402
++#: src/hugin/CPEditorPanel.cpp:1150 src/hugin/CPListFrame.cpp:402
+ #: src/hugin/PreviewFrame.cpp:156 src/hugin/xrc/cp_editor_panel.xrs:24
+ msgid "normal"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1154 src/hugin/CPListFrame.cpp:405
++#: src/hugin/CPEditorPanel.cpp:1153 src/hugin/CPListFrame.cpp:405
+ msgid "vert. Line"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1157 src/hugin/CPListFrame.cpp:408
++#: src/hugin/CPEditorPanel.cpp:1156 src/hugin/CPListFrame.cpp:408
+ msgid "horiz. Line"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1412
++#: src/hugin/CPEditorPanel.cpp:1411
+ msgid "Cannot estimate image position without control points"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1603
++#: src/hugin/CPEditorPanel.cpp:1602
+ msgid "Select Point in right image"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1615
++#: src/hugin/CPEditorPanel.cpp:1614
+ msgid "Select Point in left image"
+ msgstr ""
+
+-#: src/hugin/CPEditorPanel.cpp:1634
++#: src/hugin/CPEditorPanel.cpp:1633
+ msgid "change points, or press right mouse button to add the pair"
+ msgstr ""
+
+@@ -366,6 +378,15 @@
+ msgid "Always center Crop on d,e"
+ msgstr ""
+
++#: src/hugin/ImageCenter.cpp:105 src/hugin/xrc/pref_dialog.xrs:68
++msgid "Ok"
++msgstr ""
++
++#: src/hugin/ImageCenter.cpp:110 src/hugin/RunOptimizerFrame.cpp:310
++#: src/hugin/xrc/edit_text.xrs:3 src/hugin/xrc/pref_dialog.xrs:70
++msgid "Cancel"
++msgstr ""
++
+ #: src/hugin/ImageCenter.cpp:207 src/hugin/ImageCenter.cpp:222
+ #: src/hugin/ImageCenter.cpp:237 src/hugin/ImageCenter.cpp:252
+ msgid "Please enter a valid number"
+@@ -473,55 +494,55 @@
+ msgid "Equirectangular"
+ msgstr ""
+
+-#: src/hugin/ImagesPanel.cpp:271 src/hugin/ImagesPanel.cpp:292
+-#: src/hugin/ImagesPanel.cpp:312
++#: src/hugin/ImagesPanel.cpp:270 src/hugin/ImagesPanel.cpp:291
++#: src/hugin/ImagesPanel.cpp:311
+ msgid "Value must be numeric."
+ msgstr ""
+
+-#: src/hugin/ImagesPanel.cpp:563
++#: src/hugin/ImagesPanel.cpp:562
+ #, c-format
+ msgid "Really Delete %d control points?"
+ msgstr ""
+
+-#: src/hugin/ImagesPanel.cpp:565
++#: src/hugin/ImagesPanel.cpp:564
+ msgid "Delete Control Points"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:649
++#: src/hugin/LensPanel.cpp:650
+ msgid "Not a jpeg file:"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:654 src/hugin/LensPanel.cpp:708
+-#: src/hugin/LensPanel.cpp:784 src/hugin/LensPanel.cpp:800
+-#: src/hugin/LensPanel.cpp:818
++#: src/hugin/LensPanel.cpp:655 src/hugin/LensPanel.cpp:709
++#: src/hugin/LensPanel.cpp:785 src/hugin/LensPanel.cpp:801
++#: src/hugin/LensPanel.cpp:819
+ msgid "Please select an image and try again"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:672
++#: src/hugin/LensPanel.cpp:673
+ msgid "Save lens parameters file"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:674 src/hugin/LensPanel.cpp:724
++#: src/hugin/LensPanel.cpp:675 src/hugin/LensPanel.cpp:725
+ msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:722
++#: src/hugin/LensPanel.cpp:723
+ msgid "Load lens parameters"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Enter new lens number"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Lens number"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:809
++#: src/hugin/LensPanel.cpp:810
+ msgid "Change lens number"
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:833
++#: src/hugin/LensPanel.cpp:834
+ msgid ""
+ "Enter Crop Factor for image\n"
+ "\n"
+@@ -531,7 +552,7 @@
+ "where diagnal is the diagonal (in mm) of the film or imaging chip."
+ msgstr ""
+
+-#: src/hugin/LensPanel.cpp:834
++#: src/hugin/LensPanel.cpp:835
+ msgid "Adding Image"
+ msgstr ""
+
+@@ -560,80 +581,90 @@
+ msgid "forced close"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:491
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "No images - Nothing to do"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "Warning"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:495
+ #, c-format
+ msgid "saved project %s"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:500
++#: src/hugin/MainFrame.cpp:508
+ msgid "Save project file"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:502
++#: src/hugin/MainFrame.cpp:510
+ msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:515
++#: src/hugin/MainFrame.cpp:527
+ msgid "Save PTStitcher script file"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:517
++#: src/hugin/MainFrame.cpp:529
+ msgid "PTStitcher files (*.txt)|*.txt"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:543
++#: src/hugin/MainFrame.cpp:555
+ msgid "Open project: "
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:555
++#: src/hugin/MainFrame.cpp:567
+ msgid "Project opened"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:565
++#: src/hugin/MainFrame.cpp:577
+ msgid "Error opening project: "
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:583
++#: src/hugin/MainFrame.cpp:595
+ msgid "Open project file"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:585
++#: src/hugin/MainFrame.cpp:597
+ msgid ""
+ "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
+ "(*.*)|*.*"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:593
++#: src/hugin/MainFrame.cpp:605
+ msgid "Open project: cancel"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:615 src/include/hugin/wxPanoCommand.h:169
++#: src/hugin/MainFrame.cpp:627 src/include/hugin/wxPanoCommand.h:169
+ msgid ""
+ "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files "
+ "(*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:616 src/include/hugin/wxPanoCommand.h:170
++#: src/hugin/MainFrame.cpp:628 src/include/hugin/wxPanoCommand.h:170
+ msgid "Add images"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:660
++#: src/hugin/MainFrame.cpp:672
+ msgid "Add Image: cancel"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:985
++#: src/hugin/MainFrame.cpp:997
+ msgid "hugin - FAQ"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:1064
++#: src/hugin/MainFrame.cpp:1076
+ msgid "Fine-tuning all points"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:1066
++#: src/hugin/MainFrame.cpp:1078
+ msgid "Finetuning"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:1150
++#: src/hugin/MainFrame.cpp:1162
+ #, c-format
+ msgid ""
+ "%d points fine-tuned, %d points not updated due to low correlation\n"
+@@ -649,7 +680,7 @@
+ "Use the Control Point list (F3) to see all point of the current project\n"
+ msgstr ""
+
+-#: src/hugin/MainFrame.cpp:1152
++#: src/hugin/MainFrame.cpp:1164
+ msgid "Fine-tune result"
+ msgstr ""
+
+@@ -692,7 +723,7 @@
+ msgid "No enblend commandline tool selected"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:347
++#: src/hugin/NonaStitcherPanel.cpp:349
+ msgid ""
+ "Can not call enblend with a command line > 2000 characters.\n"
+ "This is a Windows limitiation\n"
+@@ -700,31 +731,31 @@
+ "a shorter pathname"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid "Running Enblend"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid ""
+ "Enblend will take a while to finish processing the panorama\n"
+ "You can watch the enblend progress in the command window"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:359
++#: src/hugin/NonaStitcherPanel.cpp:363
+ msgid ""
+ "Could not execute enblend, system() failed: \n"
+ "Command was :"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:360
++#: src/hugin/NonaStitcherPanel.cpp:364
+ msgid "Error returned was :"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:388
++#: src/hugin/NonaStitcherPanel.cpp:392
+ msgid "CreateProcess Error"
+ msgstr ""
+
+-#: src/hugin/NonaStitcherPanel.cpp:401
++#: src/hugin/NonaStitcherPanel.cpp:406
+ msgid "enblend error"
+ msgstr ""
+
+@@ -872,7 +903,7 @@
+ msgid "width needs to be an integer bigger than 0"
+ msgstr ""
+
+-#: src/hugin/PanoPanel.cpp:502
++#: src/hugin/PanoPanel.cpp:506
+ msgid "Create panorama image"
+ msgstr ""
+
+@@ -908,7 +939,8 @@
+ msgid "Select PTStitcher"
+ msgstr ""
+
+-#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:108
++#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:109
++#: src/hugin/RunOptimizerFrame.cpp:123
+ msgid "Select PTOptimizer"
+ msgstr ""
+
+@@ -1048,33 +1080,32 @@
+ msgid "PTStitcher note"
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:116
++#: src/hugin/RunOptimizerFrame.cpp:117
+ msgid "No PTOptimizer.exe selected"
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:140
++#: src/hugin/RunOptimizerFrame.cpp:131
++msgid "No PTOptimizer selected"
++msgstr ""
++
++#: src/hugin/RunOptimizerFrame.cpp:155
+ msgid "Failed to launch PTOptimizer."
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:151
++#: src/hugin/RunOptimizerFrame.cpp:166
+ msgid "Could not obtain PTOptimizer output"
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:161
++#: src/hugin/RunOptimizerFrame.cpp:176
+ msgid "Stop"
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:223
++#: src/hugin/RunOptimizerFrame.cpp:238
+ #, c-format
+ msgid "Strategy %d, Iteration %d, average distance: %f"
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:295 src/hugin/xrc/edit_text.xrs:3
+-#: src/hugin/xrc/pref_dialog.xrs:70
+-msgid "Cancel"
+-msgstr ""
+-
+-#: src/hugin/RunOptimizerFrame.cpp:327
++#: src/hugin/RunOptimizerFrame.cpp:342
+ msgid ""
+ "Optimizer run finished.\n"
+ "WARNING: a very small Field of View (v) has been estimated\n"
+@@ -1088,7 +1119,7 @@
+ "when the images are already aligned well."
+ msgstr ""
+
+-#: src/hugin/RunOptimizerFrame.cpp:329
++#: src/hugin/RunOptimizerFrame.cpp:344
+ #, c-format
+ msgid ""
+ "Optimizer run finished.\n"
+@@ -2399,10 +2430,6 @@
+ msgid "Delete remapped tiff files"
+ msgstr ""
+
+-#: src/hugin/xrc/pref_dialog.xrs:68
+-msgid "Ok"
+-msgstr ""
+-
+ #: src/hugin/xrc/pref_dialog.xrs:71
+ msgid "Load Defaults"
+ msgstr ""
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/po/it.po hugin/src/hugin/po/it.po
+--- hugin-0.5-beta4/src/hugin/po/it.po 2005-03-08 22:10:49.000000000 +0100
++++ hugin/src/hugin/po/it.po 2005-04-26 13:06:01.000000000 +0200
+@@ -7,7 +7,7 @@
+ msgstr ""
+ "Project-Id-Version: hugin 0.4\n"
+ "Report-Msgid-Bugs-To: pablo.dangelo@web.de\n"
+-"POT-Creation-Date: 2005-03-08 21:37+0100\n"
++"POT-Creation-Date: 2005-04-26 12:54+0300\n"
+ "PO-Revision-Date: 2005-02-23 01:13+0100\n"
+ "Last-Translator: Luca Vascon <crimsonkingit@yahoo.com>\n"
+ "Language-Team: Italian <tp@lists.linux.it>\n"
+@@ -16,66 +16,71 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ #, c-format
+ msgid "Added %d control points"
+ msgstr "Aggiunti %d punti di controllo"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ msgid "Autopano result"
+ msgstr "Risultati di Autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:102
++#: src/hugin/AutoCtrlPointCreator.cpp:107
+ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+ msgstr ""
+ "Autopano (a partire dalla versione 1.03), da http://autopano.kolor.com"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:103
++#: src/hugin/AutoCtrlPointCreator.cpp:108
+ msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+ msgstr "Autopano-Sift, da: http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Choose which autopano program should be used\n"
+ msgstr "Scegliere quale versione di Autopano utilizzare\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Select autopano type"
+ msgstr "Selezionare il tipo di autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:144
+-#: src/hugin/AutoCtrlPointCreator.cpp:331
++#: src/hugin/AutoCtrlPointCreator.cpp:149
++#: src/hugin/AutoCtrlPointCreator.cpp:393
+ msgid "Select autopano program / frontend script"
+ msgstr "Scegliere il programma Autopano / script"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:175
++#: src/hugin/AutoCtrlPointCreator.cpp:151 src/hugin/PreferencesDialog.cpp:175
+ #: src/hugin/PreferencesDialog.cpp:191 src/hugin/PreferencesDialog.cpp:207
+-#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:110
++#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:111
+ #: src/hugin/RunStitcherFrame.cpp:89
+ msgid "Executables (*.exe)|*.exe"
+ msgstr "Eseguibili (*.exe)|*.exe"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:152
+-#: src/hugin/AutoCtrlPointCreator.cpp:167
+-#: src/hugin/AutoCtrlPointCreator.cpp:339
++#: src/hugin/AutoCtrlPointCreator.cpp:157
++#: src/hugin/AutoCtrlPointCreator.cpp:209
++#: src/hugin/AutoCtrlPointCreator.cpp:401
+ msgid "No autopano selected"
+ msgstr "Non e' stata selezionata una versione di Autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:159
+-msgid "Select autopano-sift frontend script"
++#: src/hugin/AutoCtrlPointCreator.cpp:201
++#, fuzzy
++msgid "Select autopano frontend script"
+ msgstr "Selezionare uno script per autopano-sift"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:205
++#: src/hugin/AutoCtrlPointCreator.cpp:203
++msgid "Shell Scripts (*.sh)|*.sh"
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:248
+ #, c-format
+ msgid "Please use either %namefile or %i in the autopano-sift command line."
+ msgstr ""
+ "Per favore, usare %namefile o %i nella linea di comando di autopano-sift."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:206
+-#: src/hugin/AutoCtrlPointCreator.cpp:211
++#: src/hugin/AutoCtrlPointCreator.cpp:249
++#: src/hugin/AutoCtrlPointCreator.cpp:254
+ msgid "Error in Autopano command"
+ msgstr "Erore di comando in Autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:210
++#: src/hugin/AutoCtrlPointCreator.cpp:253
+ #, c-format
+ msgid ""
+ "Please use %namefile or %i to specify the input files for autopano-sift"
+@@ -83,8 +88,18 @@
+ "Per favore, usare %namefile o %i per specificare i files da usare in "
+ "autopano-sift."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:243
+-#: src/hugin/AutoCtrlPointCreator.cpp:377
++#: src/hugin/AutoCtrlPointCreator.cpp:288
++#, fuzzy
++msgid "Select autopano .Net executable."
++msgstr "Selezionare il tipo di autopano"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:297
++#, fuzzy
++msgid "No autopano directory selected"
++msgstr "Non e' stata selezionata una versione di Autopano"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:305
++#: src/hugin/AutoCtrlPointCreator.cpp:439
+ msgid ""
+ "autopano command line too long.\n"
+ "This is a windows limitation\n"
+@@ -96,18 +111,18 @@
+ "Usare meno immagini, un nome piu' breve per l'immagine\n"
+ "finale, un percorso path piu' corto nell'HD."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:244
+-#: src/hugin/AutoCtrlPointCreator.cpp:378 src/hugin/NonaStitcherPanel.cpp:348
++#: src/hugin/AutoCtrlPointCreator.cpp:306
++#: src/hugin/AutoCtrlPointCreator.cpp:440 src/hugin/NonaStitcherPanel.cpp:350
+ msgid "Too many images selected"
+ msgstr "Troppe immagini selezionate"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid "Running autopano"
+ msgstr "Autopano in esecuzione"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid ""
+ "Please wait while autopano searches control points\n"
+ "See the command window for autopanos' progress"
+@@ -116,31 +131,31 @@
+ "controllo E' possibile sorvegliare\n"
+ " il progresso di Autopano nella finestra dos."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:400 src/hugin/NonaStitcherPanel.cpp:388
+-#: src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:344
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:462 src/hugin/NonaStitcherPanel.cpp:392
++#: src/hugin/NonaStitcherPanel.cpp:401
+ msgid "Could not execute command: "
+ msgstr "Comando non eseguito:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
++#: src/hugin/AutoCtrlPointCreator.cpp:344
+ msgid "ShellExecuteEx failed"
+ msgstr "ShellExecuteEx fallito"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:300
+-#: src/hugin/AutoCtrlPointCreator.cpp:400
+-#: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:362
++#: src/hugin/AutoCtrlPointCreator.cpp:462
++#: src/hugin/AutoCtrlPointCreator.cpp:468 src/hugin/NonaStitcherPanel.cpp:401
+ msgid "wxExecute Error"
+ msgstr "Errore di wxExecute"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:298
+-#: src/hugin/AutoCtrlPointCreator.cpp:404 src/hugin/NonaStitcherPanel.cpp:399
++#: src/hugin/AutoCtrlPointCreator.cpp:360
++#: src/hugin/AutoCtrlPointCreator.cpp:466 src/hugin/NonaStitcherPanel.cpp:404
+ msgid "command: "
+ msgstr "command:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:299
+-#: src/hugin/AutoCtrlPointCreator.cpp:405 src/hugin/NonaStitcherPanel.cpp:400
++#: src/hugin/AutoCtrlPointCreator.cpp:361
++#: src/hugin/AutoCtrlPointCreator.cpp:467 src/hugin/NonaStitcherPanel.cpp:405
+ msgid ""
+ "\n"
+ "failed with error code: "
+@@ -148,13 +163,13 @@
+ "\n"
+ "fallito, codice errore:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid "Could not open "
+ msgstr "Apertura fallita"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid ""
+ " for reading\n"
+ "This is an indicator that the autopano call failed,\n"
+@@ -167,16 +182,16 @@
+ "oppure che hai sbagliato qualcosa \n"
+ "nel dargli la linea di comando."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:307
+-#: src/hugin/AutoCtrlPointCreator.cpp:416
++#: src/hugin/AutoCtrlPointCreator.cpp:369
++#: src/hugin/AutoCtrlPointCreator.cpp:478
+ msgid "autopano failure"
+ msgstr "autopano in palla."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:333 src/hugin/PreferencesDialog.cpp:239
++#: src/hugin/AutoCtrlPointCreator.cpp:395 src/hugin/PreferencesDialog.cpp:239
+ msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+ msgstr "Eseguibili (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:414
++#: src/hugin/AutoCtrlPointCreator.cpp:476
+ msgid ""
+ "\n"
+ " current directory:"
+@@ -223,27 +238,27 @@
+ msgid "Distance"
+ msgstr "Distanza"
+
+-#: src/hugin/CPEditorPanel.cpp:406
++#: src/hugin/CPEditorPanel.cpp:405
+ msgid "No corresponding point found"
+ msgstr "Nessuna corrispondenza trovata"
+
+-#: src/hugin/CPEditorPanel.cpp:475
++#: src/hugin/CPEditorPanel.cpp:474
+ msgid "new control point added"
+ msgstr "nessun punto di controllo aggiunto."
+
+-#: src/hugin/CPEditorPanel.cpp:575 src/hugin/CPEditorPanel.cpp:781
++#: src/hugin/CPEditorPanel.cpp:574 src/hugin/CPEditorPanel.cpp:780
+ msgid "searching similar point..."
+ msgstr "Ricerca punto simile..."
+
+-#: src/hugin/CPEditorPanel.cpp:594 src/hugin/CPEditorPanel.cpp:709
++#: src/hugin/CPEditorPanel.cpp:593 src/hugin/CPEditorPanel.cpp:708
+ msgid "Error during Fine-tune"
+ msgstr "Errore durante la calibrazione"
+
+-#: src/hugin/CPEditorPanel.cpp:625
++#: src/hugin/CPEditorPanel.cpp:624
+ msgid "Estimated point outside image"
+ msgstr "Punto stimato fuori dall'immagine"
+
+-#: src/hugin/CPEditorPanel.cpp:827
++#: src/hugin/CPEditorPanel.cpp:826
+ #, c-format
+ msgid ""
+ "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
+@@ -252,7 +267,7 @@
+ "Punto calibrato, angolo: %.0f grad, coefficente correlazionet: %0.3f, "
+ "curvatura: %0.3f %0.3f "
+
+-#: src/hugin/CPEditorPanel.cpp:833
++#: src/hugin/CPEditorPanel.cpp:832
+ #, c-format
+ msgid ""
+ "No similar point found.\n"
+@@ -263,36 +278,36 @@
+ "Coeff. correlazione: %.3f (dovrebbe essere > %.3f)\n"
+ "Curvatura picco: (%.3f, %.3f) ( dovrebbe essere > %.3f)"
+
+-#: src/hugin/CPEditorPanel.cpp:835
++#: src/hugin/CPEditorPanel.cpp:834
+ msgid "No similar point found"
+ msgstr "Nessun punto simile trovato"
+
+-#: src/hugin/CPEditorPanel.cpp:1151 src/hugin/CPListFrame.cpp:402
++#: src/hugin/CPEditorPanel.cpp:1150 src/hugin/CPListFrame.cpp:402
+ #: src/hugin/PreviewFrame.cpp:156 src/hugin/xrc/cp_editor_panel.xrs:24
+ msgid "normal"
+ msgstr "normale"
+
+-#: src/hugin/CPEditorPanel.cpp:1154 src/hugin/CPListFrame.cpp:405
++#: src/hugin/CPEditorPanel.cpp:1153 src/hugin/CPListFrame.cpp:405
+ msgid "vert. Line"
+ msgstr "linea vert."
+
+-#: src/hugin/CPEditorPanel.cpp:1157 src/hugin/CPListFrame.cpp:408
++#: src/hugin/CPEditorPanel.cpp:1156 src/hugin/CPListFrame.cpp:408
+ msgid "horiz. Line"
+ msgstr "Linea orizz."
+
+-#: src/hugin/CPEditorPanel.cpp:1412
++#: src/hugin/CPEditorPanel.cpp:1411
+ msgid "Cannot estimate image position without control points"
+ msgstr "Senza punti di controllo non posso posizionare le immagini "
+
+-#: src/hugin/CPEditorPanel.cpp:1603
++#: src/hugin/CPEditorPanel.cpp:1602
+ msgid "Select Point in right image"
+ msgstr "Scelglere punto in immagine dx"
+
+-#: src/hugin/CPEditorPanel.cpp:1615
++#: src/hugin/CPEditorPanel.cpp:1614
+ msgid "Select Point in left image"
+ msgstr "Scelglere punto in immagine sx"
+
+-#: src/hugin/CPEditorPanel.cpp:1634
++#: src/hugin/CPEditorPanel.cpp:1633
+ msgid "change points, or press right mouse button to add the pair"
+ msgstr "Cambiare i punti, o premere tasto DX per aggiungere la coppia"
+
+@@ -395,6 +410,15 @@
+ msgid "Always center Crop on d,e"
+ msgstr ""
+
++#: src/hugin/ImageCenter.cpp:105 src/hugin/xrc/pref_dialog.xrs:68
++msgid "Ok"
++msgstr "Ok"
++
++#: src/hugin/ImageCenter.cpp:110 src/hugin/RunOptimizerFrame.cpp:310
++#: src/hugin/xrc/edit_text.xrs:3 src/hugin/xrc/pref_dialog.xrs:70
++msgid "Cancel"
++msgstr "Cancella"
++
+ #: src/hugin/ImageCenter.cpp:207 src/hugin/ImageCenter.cpp:222
+ #: src/hugin/ImageCenter.cpp:237 src/hugin/ImageCenter.cpp:252
+ #, fuzzy
+@@ -503,55 +527,55 @@
+ msgid "Equirectangular"
+ msgstr "Equirettangolare"
+
+-#: src/hugin/ImagesPanel.cpp:271 src/hugin/ImagesPanel.cpp:292
+-#: src/hugin/ImagesPanel.cpp:312
++#: src/hugin/ImagesPanel.cpp:270 src/hugin/ImagesPanel.cpp:291
++#: src/hugin/ImagesPanel.cpp:311
+ msgid "Value must be numeric."
+ msgstr "Il valore deve essere numerico"
+
+-#: src/hugin/ImagesPanel.cpp:563
++#: src/hugin/ImagesPanel.cpp:562
+ #, c-format
+ msgid "Really Delete %d control points?"
+ msgstr "Eliminare veramente %d punti di controllo?"
+
+-#: src/hugin/ImagesPanel.cpp:565
++#: src/hugin/ImagesPanel.cpp:564
+ msgid "Delete Control Points"
+ msgstr "Eliminare Punti di Controllo"
+
+-#: src/hugin/LensPanel.cpp:649
++#: src/hugin/LensPanel.cpp:650
+ msgid "Not a jpeg file:"
+ msgstr "Non e' un jpeg valido"
+
+-#: src/hugin/LensPanel.cpp:654 src/hugin/LensPanel.cpp:708
+-#: src/hugin/LensPanel.cpp:784 src/hugin/LensPanel.cpp:800
+-#: src/hugin/LensPanel.cpp:818
++#: src/hugin/LensPanel.cpp:655 src/hugin/LensPanel.cpp:709
++#: src/hugin/LensPanel.cpp:785 src/hugin/LensPanel.cpp:801
++#: src/hugin/LensPanel.cpp:819
+ msgid "Please select an image and try again"
+ msgstr "Selezionare un'immagine prima di eseguire il comando"
+
+-#: src/hugin/LensPanel.cpp:672
++#: src/hugin/LensPanel.cpp:673
+ msgid "Save lens parameters file"
+ msgstr "Salva un file i parametri dell'obiettivo"
+
+-#: src/hugin/LensPanel.cpp:674 src/hugin/LensPanel.cpp:724
++#: src/hugin/LensPanel.cpp:675 src/hugin/LensPanel.cpp:725
+ msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
+ msgstr "File parametri obiettivo (*.ini)|*.ini|Tutti i files (*.*)|*.*"
+
+-#: src/hugin/LensPanel.cpp:722
++#: src/hugin/LensPanel.cpp:723
+ msgid "Load lens parameters"
+ msgstr "Carica parametri obiettivo"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Enter new lens number"
+ msgstr "Inserire un nuovo numero di obiettivo"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Lens number"
+ msgstr "Obiettivo numero"
+
+-#: src/hugin/LensPanel.cpp:809
++#: src/hugin/LensPanel.cpp:810
+ msgid "Change lens number"
+ msgstr "Cambia numetro obiettivo"
+
+-#: src/hugin/LensPanel.cpp:833
++#: src/hugin/LensPanel.cpp:834
+ msgid ""
+ "Enter Crop Factor for image\n"
+ "\n"
+@@ -567,7 +591,7 @@
+ "\n"
+ "ove la diagonale, in mm, e' quella della pellicola, o del chip."
+
+-#: src/hugin/LensPanel.cpp:834
++#: src/hugin/LensPanel.cpp:835
+ msgid "Adding Image"
+ msgstr "Aggiungere immagine"
+
+@@ -601,44 +625,54 @@
+ msgid "forced close"
+ msgstr "chiusura forzata"
+
+-#: src/hugin/MainFrame.cpp:491
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "No images - Nothing to do"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "Warning"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:495
+ #, c-format
+ msgid "saved project %s"
+ msgstr "Salva progetto %s"
+
+-#: src/hugin/MainFrame.cpp:500
++#: src/hugin/MainFrame.cpp:508
+ msgid "Save project file"
+ msgstr "Salva file progetto"
+
+-#: src/hugin/MainFrame.cpp:502
++#: src/hugin/MainFrame.cpp:510
+ msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*"
+ msgstr "files di progetto (*.pto)|*.pto|All files (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:515
++#: src/hugin/MainFrame.cpp:527
+ msgid "Save PTStitcher script file"
+ msgstr "Salva script per PTStitcher"
+
+-#: src/hugin/MainFrame.cpp:517
++#: src/hugin/MainFrame.cpp:529
+ msgid "PTStitcher files (*.txt)|*.txt"
+ msgstr "Files di PTStitcher (*.txt)|*.txt"
+
+-#: src/hugin/MainFrame.cpp:543
++#: src/hugin/MainFrame.cpp:555
+ msgid "Open project: "
+ msgstr "Apri progetto:"
+
+-#: src/hugin/MainFrame.cpp:555
++#: src/hugin/MainFrame.cpp:567
+ msgid "Project opened"
+ msgstr "Progetto aperto"
+
+-#: src/hugin/MainFrame.cpp:565
++#: src/hugin/MainFrame.cpp:577
+ msgid "Error opening project: "
+ msgstr "Errore nell'aprire il progetto"
+
+-#: src/hugin/MainFrame.cpp:583
++#: src/hugin/MainFrame.cpp:595
+ msgid "Open project file"
+ msgstr "Apri file progetto"
+
+-#: src/hugin/MainFrame.cpp:585
++#: src/hugin/MainFrame.cpp:597
+ msgid ""
+ "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
+ "(*.*)|*.*"
+@@ -646,11 +680,11 @@
+ "Files progetto (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
+ "(*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:593
++#: src/hugin/MainFrame.cpp:605
+ msgid "Open project: cancel"
+ msgstr "Apri progetto: annulla"
+
+-#: src/hugin/MainFrame.cpp:615 src/include/hugin/wxPanoCommand.h:169
++#: src/hugin/MainFrame.cpp:627 src/include/hugin/wxPanoCommand.h:169
+ msgid ""
+ "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files "
+ "(*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
+@@ -658,27 +692,27 @@
+ "Files immagine (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image "
+ "files (*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:616 src/include/hugin/wxPanoCommand.h:170
++#: src/hugin/MainFrame.cpp:628 src/include/hugin/wxPanoCommand.h:170
+ msgid "Add images"
+ msgstr "Aggiungi immagini"
+
+-#: src/hugin/MainFrame.cpp:660
++#: src/hugin/MainFrame.cpp:672
+ msgid "Add Image: cancel"
+ msgstr "Aggiungi immagine: annulla"
+
+-#: src/hugin/MainFrame.cpp:985
++#: src/hugin/MainFrame.cpp:997
+ msgid "hugin - FAQ"
+ msgstr "hugin - FAQ"
+
+-#: src/hugin/MainFrame.cpp:1064
++#: src/hugin/MainFrame.cpp:1076
+ msgid "Fine-tuning all points"
+ msgstr "Ricalibra tutti i punti "
+
+-#: src/hugin/MainFrame.cpp:1066
++#: src/hugin/MainFrame.cpp:1078
+ msgid "Finetuning"
+ msgstr "Calibrazione"
+
+-#: src/hugin/MainFrame.cpp:1150
++#: src/hugin/MainFrame.cpp:1162
+ #, c-format
+ msgid ""
+ "%d points fine-tuned, %d points not updated due to low correlation\n"
+@@ -706,7 +740,7 @@
+ "\n"
+ "Use the Control Point list (F3) to see all point of the current project\n"
+
+-#: src/hugin/MainFrame.cpp:1152
++#: src/hugin/MainFrame.cpp:1164
+ msgid "Fine-tune result"
+ msgstr "Risultato calibrazione"
+
+@@ -749,7 +783,7 @@
+ msgid "No enblend commandline tool selected"
+ msgstr "Non e' stato impostato alcun comando per Enblend"
+
+-#: src/hugin/NonaStitcherPanel.cpp:347
++#: src/hugin/NonaStitcherPanel.cpp:349
+ msgid ""
+ "Can not call enblend with a command line > 2000 characters.\n"
+ "This is a Windows limitiation\n"
+@@ -761,11 +795,11 @@
+ "Usare meno immagini, un nome piu' breve per l'immagine\n"
+ "finale, un percorso path piu' corto nell'HD."
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid "Running Enblend"
+ msgstr "Enblend in esecuzione"
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid ""
+ "Enblend will take a while to finish processing the panorama\n"
+ "You can watch the enblend progress in the command window"
+@@ -773,7 +807,7 @@
+ "Enblend impiegherà del tempo a terminare il panorama\n"
+ "e' possibile sorvegliare il processo nella finestra di comando"
+
+-#: src/hugin/NonaStitcherPanel.cpp:359
++#: src/hugin/NonaStitcherPanel.cpp:363
+ msgid ""
+ "Could not execute enblend, system() failed: \n"
+ "Command was :"
+@@ -781,15 +815,15 @@
+ "Enblend non eseguito, system() failed: \n"
+ "Il comando era :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:360
++#: src/hugin/NonaStitcherPanel.cpp:364
+ msgid "Error returned was :"
+ msgstr "L'errore riportato e' :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:388
++#: src/hugin/NonaStitcherPanel.cpp:392
+ msgid "CreateProcess Error"
+ msgstr "CreateProcess Error"
+
+-#: src/hugin/NonaStitcherPanel.cpp:401
++#: src/hugin/NonaStitcherPanel.cpp:406
+ msgid "enblend error"
+ msgstr "errore in Enblend"
+
+@@ -978,7 +1012,7 @@
+ msgid "width needs to be an integer bigger than 0"
+ msgstr "la larghezza deve essere un intero maggiore di 0"
+
+-#: src/hugin/PanoPanel.cpp:502
++#: src/hugin/PanoPanel.cpp:506
+ msgid "Create panorama image"
+ msgstr "Crea l'immagine panoramica"
+
+@@ -1014,7 +1048,8 @@
+ msgid "Select PTStitcher"
+ msgstr "Seleziona PTStitcher.exe"
+
+-#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:108
++#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:109
++#: src/hugin/RunOptimizerFrame.cpp:123
+ msgid "Select PTOptimizer"
+ msgstr "Seleziona PTOptimizer"
+
+@@ -1154,33 +1189,33 @@
+ msgid "PTStitcher note"
+ msgstr "nota PTStitcher"
+
+-#: src/hugin/RunOptimizerFrame.cpp:116
++#: src/hugin/RunOptimizerFrame.cpp:117
+ msgid "No PTOptimizer.exe selected"
+ msgstr "Non hai selezionato il PTOptimizer.exe"
+
+-#: src/hugin/RunOptimizerFrame.cpp:140
++#: src/hugin/RunOptimizerFrame.cpp:131
++#, fuzzy
++msgid "No PTOptimizer selected"
++msgstr "Non hai selezionato il PTOptimizer.exe"
++
++#: src/hugin/RunOptimizerFrame.cpp:155
+ msgid "Failed to launch PTOptimizer."
+ msgstr "Avvio di PTOptimizer fallito."
+
+-#: src/hugin/RunOptimizerFrame.cpp:151
++#: src/hugin/RunOptimizerFrame.cpp:166
+ msgid "Could not obtain PTOptimizer output"
+ msgstr "PTOptimizer output non ottenuto"
+
+-#: src/hugin/RunOptimizerFrame.cpp:161
++#: src/hugin/RunOptimizerFrame.cpp:176
+ msgid "Stop"
+ msgstr "Stop"
+
+-#: src/hugin/RunOptimizerFrame.cpp:223
++#: src/hugin/RunOptimizerFrame.cpp:238
+ #, c-format
+ msgid "Strategy %d, Iteration %d, average distance: %f"
+ msgstr "Strategy %d, Iteration %d, distanza media: %f"
+
+-#: src/hugin/RunOptimizerFrame.cpp:295 src/hugin/xrc/edit_text.xrs:3
+-#: src/hugin/xrc/pref_dialog.xrs:70
+-msgid "Cancel"
+-msgstr "Cancella"
+-
+-#: src/hugin/RunOptimizerFrame.cpp:327
++#: src/hugin/RunOptimizerFrame.cpp:342
+ msgid ""
+ "Optimizer run finished.\n"
+ "WARNING: a very small Field of View (v) has been estimated\n"
+@@ -1203,7 +1238,7 @@
+ "well,\n"
+ "when the images are already aligned well."
+
+-#: src/hugin/RunOptimizerFrame.cpp:329
++#: src/hugin/RunOptimizerFrame.cpp:344
+ #, c-format
+ msgid ""
+ "Optimizer run finished.\n"
+@@ -2556,10 +2591,6 @@
+ msgid "Delete remapped tiff files"
+ msgstr ""
+
+-#: src/hugin/xrc/pref_dialog.xrs:68
+-msgid "Ok"
+-msgstr "Ok"
+-
+ #: src/hugin/xrc/pref_dialog.xrs:71
+ msgid "Load Defaults"
+ msgstr "Carica Defaults"
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/po/pl.po hugin/src/hugin/po/pl.po
+--- hugin-0.5-beta4/src/hugin/po/pl.po 2005-03-08 22:10:50.000000000 +0100
++++ hugin/src/hugin/po/pl.po 2005-04-26 13:06:01.000000000 +0200
+@@ -7,74 +7,79 @@
+ msgstr ""
+ "Project-Id-Version: hugin 0.5\n"
+ "Report-Msgid-Bugs-To: pablo.dangelo@web.de\n"
+-"POT-Creation-Date: 2005-03-08 21:37+0100\n"
+-"PO-Revision-Date: 2005-02-07 10:19-0500\n"
++"POT-Creation-Date: 2005-04-26 12:54+0300\n"
++"PO-Revision-Date: 2005-04-02 12:45-0500\n"
+ "Last-Translator: Marek Januszewski <spec@webtech.pl>\n"
+ "Language-Team: Polish <pl@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ #, c-format
+ msgid "Added %d control points"
+ msgstr "Dodano %d punktów kontrolnych"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:87
++#: src/hugin/AutoCtrlPointCreator.cpp:92
+ msgid "Autopano result"
+ msgstr "Wynik autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:102
++#: src/hugin/AutoCtrlPointCreator.cpp:107
+ msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
+ msgstr ""
+ "Autopano (wersja 1.03 lub późniejsza), ze strony http://autopano.kolor.com"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:103
++#: src/hugin/AutoCtrlPointCreator.cpp:108
+ msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+ msgstr ""
+ "Autopano-Sift, ze strony http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Choose which autopano program should be used\n"
+ msgstr "Wybierz który program autopano ma być używany\n"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:105
++#: src/hugin/AutoCtrlPointCreator.cpp:110
+ msgid "Select autopano type"
+ msgstr "Wybierz typ autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:144
+-#: src/hugin/AutoCtrlPointCreator.cpp:331
++#: src/hugin/AutoCtrlPointCreator.cpp:149
++#: src/hugin/AutoCtrlPointCreator.cpp:393
+ msgid "Select autopano program / frontend script"
+ msgstr "Wybierz program autopano / skrypt interfejsu"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:146 src/hugin/PreferencesDialog.cpp:175
++#: src/hugin/AutoCtrlPointCreator.cpp:151 src/hugin/PreferencesDialog.cpp:175
+ #: src/hugin/PreferencesDialog.cpp:191 src/hugin/PreferencesDialog.cpp:207
+-#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:110
++#: src/hugin/PreferencesDialog.cpp:223 src/hugin/RunOptimizerFrame.cpp:111
+ #: src/hugin/RunStitcherFrame.cpp:89
+ msgid "Executables (*.exe)|*.exe"
+ msgstr "Pliki wykonywalne (*.exe)|*.exe"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:152
+-#: src/hugin/AutoCtrlPointCreator.cpp:167
+-#: src/hugin/AutoCtrlPointCreator.cpp:339
++#: src/hugin/AutoCtrlPointCreator.cpp:157
++#: src/hugin/AutoCtrlPointCreator.cpp:209
++#: src/hugin/AutoCtrlPointCreator.cpp:401
+ msgid "No autopano selected"
+ msgstr "Nie wybrano autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:159
+-msgid "Select autopano-sift frontend script"
++#: src/hugin/AutoCtrlPointCreator.cpp:201
++#, fuzzy
++msgid "Select autopano frontend script"
+ msgstr "Wybierz autopano-sift skrypt interfejsu"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:205
++#: src/hugin/AutoCtrlPointCreator.cpp:203
++msgid "Shell Scripts (*.sh)|*.sh"
++msgstr ""
++
++#: src/hugin/AutoCtrlPointCreator.cpp:248
+ #, c-format
+ msgid "Please use either %namefile or %i in the autopano-sift command line."
+ msgstr "Proszę użyć albo %namefile albo %i linii poleceń autopano-sift."
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:206
+-#: src/hugin/AutoCtrlPointCreator.cpp:211
++#: src/hugin/AutoCtrlPointCreator.cpp:249
++#: src/hugin/AutoCtrlPointCreator.cpp:254
+ msgid "Error in Autopano command"
+ msgstr "Błąd w poleceniu autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:210
++#: src/hugin/AutoCtrlPointCreator.cpp:253
+ #, c-format
+ msgid ""
+ "Please use %namefile or %i to specify the input files for autopano-sift"
+@@ -82,8 +87,18 @@
+ "Proszę użyć %namefile lub %i by podać nazwę plików wejściowych dla autopano-"
+ "sift"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:243
+-#: src/hugin/AutoCtrlPointCreator.cpp:377
++#: src/hugin/AutoCtrlPointCreator.cpp:288
++#, fuzzy
++msgid "Select autopano .Net executable."
++msgstr "Wybierz typ autopano"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:297
++#, fuzzy
++msgid "No autopano directory selected"
++msgstr "Nie wybrano autopano"
++
++#: src/hugin/AutoCtrlPointCreator.cpp:305
++#: src/hugin/AutoCtrlPointCreator.cpp:439
+ msgid ""
+ "autopano command line too long.\n"
+ "This is a windows limitation\n"
+@@ -95,18 +110,18 @@
+ "Proszę wybrać mniej zdjęć lub umieścić zdjęcia w folderze z\n"
+ "krótszą ścieżką"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:244
+-#: src/hugin/AutoCtrlPointCreator.cpp:378 src/hugin/NonaStitcherPanel.cpp:348
++#: src/hugin/AutoCtrlPointCreator.cpp:306
++#: src/hugin/AutoCtrlPointCreator.cpp:440 src/hugin/NonaStitcherPanel.cpp:350
+ msgid "Too many images selected"
+ msgstr "Wybrano zbyt wiele zdjęć"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid "Running autopano"
+ msgstr "Uruchomiono autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:253
+-#: src/hugin/AutoCtrlPointCreator.cpp:385
++#: src/hugin/AutoCtrlPointCreator.cpp:315
++#: src/hugin/AutoCtrlPointCreator.cpp:447
+ msgid ""
+ "Please wait while autopano searches control points\n"
+ "See the command window for autopanos' progress"
+@@ -114,31 +129,31 @@
+ "Proszę czekać. Autopano szuka punktów kontrolnych\n"
+ "Sprawdź okno poleceń by zobaczyć postęp autopano"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:400 src/hugin/NonaStitcherPanel.cpp:388
+-#: src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:344
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:462 src/hugin/NonaStitcherPanel.cpp:392
++#: src/hugin/NonaStitcherPanel.cpp:401
+ msgid "Could not execute command: "
+ msgstr "Nie mogłem wykonać polecenia:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:282
++#: src/hugin/AutoCtrlPointCreator.cpp:344
+ msgid "ShellExecuteEx failed"
+ msgstr "błąd ShellExecuteEx"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:295
+-#: src/hugin/AutoCtrlPointCreator.cpp:300
+-#: src/hugin/AutoCtrlPointCreator.cpp:400
+-#: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:396
++#: src/hugin/AutoCtrlPointCreator.cpp:357
++#: src/hugin/AutoCtrlPointCreator.cpp:362
++#: src/hugin/AutoCtrlPointCreator.cpp:462
++#: src/hugin/AutoCtrlPointCreator.cpp:468 src/hugin/NonaStitcherPanel.cpp:401
+ msgid "wxExecute Error"
+ msgstr "Błąd wxExecute"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:298
+-#: src/hugin/AutoCtrlPointCreator.cpp:404 src/hugin/NonaStitcherPanel.cpp:399
++#: src/hugin/AutoCtrlPointCreator.cpp:360
++#: src/hugin/AutoCtrlPointCreator.cpp:466 src/hugin/NonaStitcherPanel.cpp:404
+ msgid "command: "
+ msgstr "polecenie:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:299
+-#: src/hugin/AutoCtrlPointCreator.cpp:405 src/hugin/NonaStitcherPanel.cpp:400
++#: src/hugin/AutoCtrlPointCreator.cpp:361
++#: src/hugin/AutoCtrlPointCreator.cpp:467 src/hugin/NonaStitcherPanel.cpp:405
+ msgid ""
+ "\n"
+ "failed with error code: "
+@@ -146,13 +161,13 @@
+ "\n"
+ "niepowodzenie z kodem błędu:"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid "Could not open "
+ msgstr "Nie można otworzyć"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:306
+-#: src/hugin/AutoCtrlPointCreator.cpp:413
++#: src/hugin/AutoCtrlPointCreator.cpp:368
++#: src/hugin/AutoCtrlPointCreator.cpp:475
+ msgid ""
+ " for reading\n"
+ "This is an indicator that the autopano call failed,\n"
+@@ -166,16 +181,16 @@
+ "\n"
+ "Polecenie autopano: "
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:307
+-#: src/hugin/AutoCtrlPointCreator.cpp:416
++#: src/hugin/AutoCtrlPointCreator.cpp:369
++#: src/hugin/AutoCtrlPointCreator.cpp:478
+ msgid "autopano failure"
+ msgstr "autopano nie powiodło się"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:333 src/hugin/PreferencesDialog.cpp:239
++#: src/hugin/AutoCtrlPointCreator.cpp:395 src/hugin/PreferencesDialog.cpp:239
+ msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+ msgstr "Pliki wykonywalne (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
+
+-#: src/hugin/AutoCtrlPointCreator.cpp:414
++#: src/hugin/AutoCtrlPointCreator.cpp:476
+ msgid ""
+ "\n"
+ " current directory:"
+@@ -222,27 +237,27 @@
+ msgid "Distance"
+ msgstr "Odległość"
+
+-#: src/hugin/CPEditorPanel.cpp:406
++#: src/hugin/CPEditorPanel.cpp:405
+ msgid "No corresponding point found"
+ msgstr "Nie znaleziono odpowiadającego punktu"
+
+-#: src/hugin/CPEditorPanel.cpp:475
++#: src/hugin/CPEditorPanel.cpp:474
+ msgid "new control point added"
+ msgstr "Dodano nowy punkt kontrolny"
+
+-#: src/hugin/CPEditorPanel.cpp:575 src/hugin/CPEditorPanel.cpp:781
++#: src/hugin/CPEditorPanel.cpp:574 src/hugin/CPEditorPanel.cpp:780
+ msgid "searching similar point..."
+ msgstr "szukam podobnego punktu..."
+
+-#: src/hugin/CPEditorPanel.cpp:594 src/hugin/CPEditorPanel.cpp:709
++#: src/hugin/CPEditorPanel.cpp:593 src/hugin/CPEditorPanel.cpp:708
+ msgid "Error during Fine-tune"
+ msgstr "Błąd podcza dostrajania"
+
+-#: src/hugin/CPEditorPanel.cpp:625
++#: src/hugin/CPEditorPanel.cpp:624
+ msgid "Estimated point outside image"
+ msgstr "Estymowany punkt jest poza obszarem zdjęcia"
+
+-#: src/hugin/CPEditorPanel.cpp:827
++#: src/hugin/CPEditorPanel.cpp:826
+ #, c-format
+ msgid ""
+ "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
+@@ -251,7 +266,7 @@
+ "Punkt dostrojony, kąt: %.0f stopni, współczynnik korelacji: %0.3f, "
+ "zakrzywienie: %0.3f %0.3f "
+
+-#: src/hugin/CPEditorPanel.cpp:833
++#: src/hugin/CPEditorPanel.cpp:832
+ #, c-format
+ msgid ""
+ "No similar point found.\n"
+@@ -262,36 +277,36 @@
+ "współczynnik korelacji: %.3f (powininen być < %.3f)\n"
+ "szczyt zakrzywienia: (%.3f, %.3f), ( powinien być > %.3f)"
+
+-#: src/hugin/CPEditorPanel.cpp:835
++#: src/hugin/CPEditorPanel.cpp:834
+ msgid "No similar point found"
+ msgstr "Nie znaleziono podobnego punktu"
+
+-#: src/hugin/CPEditorPanel.cpp:1151 src/hugin/CPListFrame.cpp:402
++#: src/hugin/CPEditorPanel.cpp:1150 src/hugin/CPListFrame.cpp:402
+ #: src/hugin/PreviewFrame.cpp:156 src/hugin/xrc/cp_editor_panel.xrs:24
+ msgid "normal"
+ msgstr "normalny"
+
+-#: src/hugin/CPEditorPanel.cpp:1154 src/hugin/CPListFrame.cpp:405
++#: src/hugin/CPEditorPanel.cpp:1153 src/hugin/CPListFrame.cpp:405
+ msgid "vert. Line"
+ msgstr "pion. linia"
+
+-#: src/hugin/CPEditorPanel.cpp:1157 src/hugin/CPListFrame.cpp:408
++#: src/hugin/CPEditorPanel.cpp:1156 src/hugin/CPListFrame.cpp:408
+ msgid "horiz. Line"
+ msgstr "poz. linia"
+
+-#: src/hugin/CPEditorPanel.cpp:1412
++#: src/hugin/CPEditorPanel.cpp:1411
+ msgid "Cannot estimate image position without control points"
+ msgstr "Nie mogę estymować pozycji zdjęcia bez punktów kontrolnych"
+
+-#: src/hugin/CPEditorPanel.cpp:1603
++#: src/hugin/CPEditorPanel.cpp:1602
+ msgid "Select Point in right image"
+ msgstr "Zaznacz punkt na prawym zdjęciu"
+
+-#: src/hugin/CPEditorPanel.cpp:1615
++#: src/hugin/CPEditorPanel.cpp:1614
+ msgid "Select Point in left image"
+ msgstr "Zaznacz punkt na lewym zdjęciu"
+
+-#: src/hugin/CPEditorPanel.cpp:1634
++#: src/hugin/CPEditorPanel.cpp:1633
+ msgid "change points, or press right mouse button to add the pair"
+ msgstr "zmień punkty lub naciśniej prawy przycisk myszy by dodać parę"
+
+@@ -364,27 +379,24 @@
+ msgstr "Tworzę zdjęcie piramidalne dla %s, poziom %d"
+
+ #: src/hugin/ImageCenter.cpp:61
+-#, fuzzy
+ msgid "Crop Image"
+-msgstr "Zdjęcie-odniesienie"
++msgstr "Ucięcie zdjecia"
+
+ #: src/hugin/ImageCenter.cpp:80
+ msgid "Left:"
+-msgstr ""
++msgstr "Lewy:"
+
+ #: src/hugin/ImageCenter.cpp:85
+-#, fuzzy
+ msgid "Right:"
+-msgstr "wysokość"
++msgstr "Prawo:"
+
+ #: src/hugin/ImageCenter.cpp:90
+ msgid "Top:"
+-msgstr ""
++msgstr "Góra:"
+
+ #: src/hugin/ImageCenter.cpp:95
+-#, fuzzy
+ msgid "Bottom:"
+-msgstr "Zoom:"
++msgstr "Dół:"
+
+ #: src/hugin/ImageCenter.cpp:100 src/hugin/xrc/images_panel.xrs:31
+ msgid "Reset"
+@@ -392,13 +404,21 @@
+
+ #: src/hugin/ImageCenter.cpp:102
+ msgid "Always center Crop on d,e"
+-msgstr ""
++msgstr "Zawsze środkuj Ucięcie na d,e"
++
++#: src/hugin/ImageCenter.cpp:105 src/hugin/xrc/pref_dialog.xrs:68
++msgid "Ok"
++msgstr "Ok"
++
++#: src/hugin/ImageCenter.cpp:110 src/hugin/RunOptimizerFrame.cpp:310
++#: src/hugin/xrc/edit_text.xrs:3 src/hugin/xrc/pref_dialog.xrs:70
++msgid "Cancel"
++msgstr "Anuluj"
+
+ #: src/hugin/ImageCenter.cpp:207 src/hugin/ImageCenter.cpp:222
+ #: src/hugin/ImageCenter.cpp:237 src/hugin/ImageCenter.cpp:252
+-#, fuzzy
+ msgid "Please enter a valid number"
+-msgstr "Błąd: proszę wpisać poprawny numer"
++msgstr "Proszę wpisać poprawny numer"
+
+ #: src/hugin/ImageOrientationPanel.cpp:132
+ #, c-format
+@@ -479,7 +499,7 @@
+
+ #: src/hugin/ImagesList.cpp:291
+ msgid "Crop"
+-msgstr ""
++msgstr "Ucięcie"
+
+ #: src/hugin/ImagesList.cpp:305 src/hugin/xrc/lens_panel.xrs:2
+ msgid "Normal (rectilinear)"
+@@ -502,55 +522,55 @@
+ msgid "Equirectangular"
+ msgstr "Sferyczny"
+
+-#: src/hugin/ImagesPanel.cpp:271 src/hugin/ImagesPanel.cpp:292
+-#: src/hugin/ImagesPanel.cpp:312
++#: src/hugin/ImagesPanel.cpp:270 src/hugin/ImagesPanel.cpp:291
++#: src/hugin/ImagesPanel.cpp:311
+ msgid "Value must be numeric."
+ msgstr "Wartość musi być numeryczna."
+
+-#: src/hugin/ImagesPanel.cpp:563
++#: src/hugin/ImagesPanel.cpp:562
+ #, c-format
+ msgid "Really Delete %d control points?"
+ msgstr "Na pewno usunąć %d punktów kontrolnych?"
+
+-#: src/hugin/ImagesPanel.cpp:565
++#: src/hugin/ImagesPanel.cpp:564
+ msgid "Delete Control Points"
+ msgstr "Usuń punkty kontrolne"
+
+-#: src/hugin/LensPanel.cpp:649
++#: src/hugin/LensPanel.cpp:650
+ msgid "Not a jpeg file:"
+ msgstr "To nie jest plik jpeg:"
+
+-#: src/hugin/LensPanel.cpp:654 src/hugin/LensPanel.cpp:708
+-#: src/hugin/LensPanel.cpp:784 src/hugin/LensPanel.cpp:800
+-#: src/hugin/LensPanel.cpp:818
++#: src/hugin/LensPanel.cpp:655 src/hugin/LensPanel.cpp:709
++#: src/hugin/LensPanel.cpp:785 src/hugin/LensPanel.cpp:801
++#: src/hugin/LensPanel.cpp:819
+ msgid "Please select an image and try again"
+ msgstr "Proszę wybrać zdjęcie i spróbować ponownie"
+
+-#: src/hugin/LensPanel.cpp:672
++#: src/hugin/LensPanel.cpp:673
+ msgid "Save lens parameters file"
+ msgstr "Zapisz plik parametrów obiektywów"
+
+-#: src/hugin/LensPanel.cpp:674 src/hugin/LensPanel.cpp:724
++#: src/hugin/LensPanel.cpp:675 src/hugin/LensPanel.cpp:725
+ msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
+ msgstr "Pliki parametrów obiektywów (*.ini)|*.ini|Wszystkie pliki (*.*)|*.*"
+
+-#: src/hugin/LensPanel.cpp:722
++#: src/hugin/LensPanel.cpp:723
+ msgid "Load lens parameters"
+ msgstr "Otwórz parametry obiektywów"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Enter new lens number"
+ msgstr "Wpisz numer nowego obiektywu"
+
+-#: src/hugin/LensPanel.cpp:808
++#: src/hugin/LensPanel.cpp:809
+ msgid "Lens number"
+ msgstr "Numer obiektywu"
+
+-#: src/hugin/LensPanel.cpp:809
++#: src/hugin/LensPanel.cpp:810
+ msgid "Change lens number"
+ msgstr "Zmień numer obiektywu"
+
+-#: src/hugin/LensPanel.cpp:833
++#: src/hugin/LensPanel.cpp:834
+ msgid ""
+ "Enter Crop Factor for image\n"
+ "\n"
+@@ -566,7 +586,7 @@
+ "\n"
+ "gdzie przekątna jest przekątną (w mm) filmu lub matrycy cyfrowej."
+
+-#: src/hugin/LensPanel.cpp:834
++#: src/hugin/LensPanel.cpp:835
+ msgid "Adding Image"
+ msgstr "&Dodaję zdjęcie"
+
+@@ -600,44 +620,54 @@
+ msgid "forced close"
+ msgstr "wymuszone zamknięcie"
+
+-#: src/hugin/MainFrame.cpp:491
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "No images - Nothing to do"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:476 src/hugin/MainFrame.cpp:504
++#: src/hugin/MainFrame.cpp:523 src/hugin/PanoPanel.cpp:495
++msgid "Warning"
++msgstr ""
++
++#: src/hugin/MainFrame.cpp:495
+ #, c-format
+ msgid "saved project %s"
+ msgstr "zapisano projekt %s"
+
+-#: src/hugin/MainFrame.cpp:500
++#: src/hugin/MainFrame.cpp:508
+ msgid "Save project file"
+ msgstr "Zapisz projekt"
+
+-#: src/hugin/MainFrame.cpp:502
++#: src/hugin/MainFrame.cpp:510
+ msgid "Project files (*.pto)|*.pto|All files (*.*)|*.*"
+ msgstr "Pliki projektów (*.pto)|*.pto|Wszystkie pliki (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:515
++#: src/hugin/MainFrame.cpp:527
+ msgid "Save PTStitcher script file"
+ msgstr "Zapisz plik skryptu PTStitcher"
+
+-#: src/hugin/MainFrame.cpp:517
++#: src/hugin/MainFrame.cpp:529
+ msgid "PTStitcher files (*.txt)|*.txt"
+ msgstr "Pliki PTStitcher'a (*.txt)|*.txt"
+
+-#: src/hugin/MainFrame.cpp:543
++#: src/hugin/MainFrame.cpp:555
+ msgid "Open project: "
+ msgstr "Otwórz projekt"
+
+-#: src/hugin/MainFrame.cpp:555
++#: src/hugin/MainFrame.cpp:567
+ msgid "Project opened"
+ msgstr "Otwarto projekt"
+
+-#: src/hugin/MainFrame.cpp:565
++#: src/hugin/MainFrame.cpp:577
+ msgid "Error opening project: "
+ msgstr "Błąd podczas otwierania projektu:"
+
+-#: src/hugin/MainFrame.cpp:583
++#: src/hugin/MainFrame.cpp:595
+ msgid "Open project file"
+ msgstr "Otwórz projekt"
+
+-#: src/hugin/MainFrame.cpp:585
++#: src/hugin/MainFrame.cpp:597
+ msgid ""
+ "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
+ "(*.*)|*.*"
+@@ -645,11 +675,11 @@
+ "Pliki projektów (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Wszystkie "
+ "zdjęcia (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:593
++#: src/hugin/MainFrame.cpp:605
+ msgid "Open project: cancel"
+ msgstr "Otwórz projekt: anuluj"
+
+-#: src/hugin/MainFrame.cpp:615 src/include/hugin/wxPanoCommand.h:169
++#: src/hugin/MainFrame.cpp:627 src/include/hugin/wxPanoCommand.h:169
+ msgid ""
+ "Image files (*.jpg)|*.jpg;*.JPG|Image files (*.png)|*.png;*.PNG|Image files "
+ "(*.tif)|*.tif;*.TIF|All files (*.*)|*.*"
+@@ -657,27 +687,27 @@
+ "Pliki zdjęć (*.jpg)|*.jpg;*.JPG|Pliki zdjęć (*.png)|*.png;*.PNG|Pliki zdjęć "
+ "(*.tif)|*.tif;*.TIF|Wszystkie pliki (*.*)|*.*"
+
+-#: src/hugin/MainFrame.cpp:616 src/include/hugin/wxPanoCommand.h:170
++#: src/hugin/MainFrame.cpp:628 src/include/hugin/wxPanoCommand.h:170
+ msgid "Add images"
+ msgstr "Dodaj zdjęcia"
+
+-#: src/hugin/MainFrame.cpp:660
++#: src/hugin/MainFrame.cpp:672
+ msgid "Add Image: cancel"
+ msgstr "Dodaj zdjęcia: anuluj"
+
+-#: src/hugin/MainFrame.cpp:985
++#: src/hugin/MainFrame.cpp:997
+ msgid "hugin - FAQ"
+ msgstr "hugin - FAQ"
+
+-#: src/hugin/MainFrame.cpp:1064
++#: src/hugin/MainFrame.cpp:1076
+ msgid "Fine-tuning all points"
+ msgstr "Dostrajanie wszystkich punktów"
+
+-#: src/hugin/MainFrame.cpp:1066
++#: src/hugin/MainFrame.cpp:1078
+ msgid "Finetuning"
+ msgstr "Dostrajam"
+
+-#: src/hugin/MainFrame.cpp:1150
++#: src/hugin/MainFrame.cpp:1162
+ #, c-format
+ msgid ""
+ "%d points fine-tuned, %d points not updated due to low correlation\n"
+@@ -707,13 +737,13 @@
+ "Użyj listy Punktów Kontrolnych (F3) aby zobaczyć wszystkie punkty obecnego "
+ "projektu\n"
+
+-#: src/hugin/MainFrame.cpp:1152
++#: src/hugin/MainFrame.cpp:1164
+ msgid "Fine-tune result"
+ msgstr "Rezultat dostrajania"
+
+ #: src/hugin/MyProgressDialog.cpp:36
+ msgid "Elapsed time : "
+-msgstr "Ułynęło już : "
++msgstr "Upłynęło już : "
+
+ #: src/hugin/NonaStitcherPanel.cpp:236
+ msgid "Stitching Panorama"
+@@ -725,10 +755,13 @@
+ "The crop settings will be ignored\n"
+ "Continue anyway?"
+ msgstr ""
++"Nona jeszcze nie obsługuje zdjęć z danymi ucięcia.\n"
++"Ustawienia ucięcia będą zignorowane\n"
++"Kontynuować?"
+
+ #: src/hugin/NonaStitcherPanel.cpp:261
+ msgid "Cropping not supported by nona"
+-msgstr ""
++msgstr "Nona nie obsługuje ucinania"
+
+ #: src/hugin/NonaStitcherPanel.cpp:280
+ msgid "error during stitching:"
+@@ -750,7 +783,7 @@
+ msgid "No enblend commandline tool selected"
+ msgstr "Nie wybrano narzędzia enblend"
+
+-#: src/hugin/NonaStitcherPanel.cpp:347
++#: src/hugin/NonaStitcherPanel.cpp:349
+ msgid ""
+ "Can not call enblend with a command line > 2000 characters.\n"
+ "This is a Windows limitiation\n"
+@@ -762,11 +795,11 @@
+ "Proszę użyć mniejszej ilości zdjęć, lub skopiować je do folderu\n"
+ "o krótszej nazwie ścieżki"
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid "Running Enblend"
+ msgstr "Uruchomiono Enblend"
+
+-#: src/hugin/NonaStitcherPanel.cpp:353
++#: src/hugin/NonaStitcherPanel.cpp:355
+ msgid ""
+ "Enblend will take a while to finish processing the panorama\n"
+ "You can watch the enblend progress in the command window"
+@@ -774,7 +807,7 @@
+ "Enblend zajmie chwilę, aby zakończyć pracę nad panoramą\n"
+ "Możesz podglądać przebieg programu enblend w oknie poleceń"
+
+-#: src/hugin/NonaStitcherPanel.cpp:359
++#: src/hugin/NonaStitcherPanel.cpp:363
+ msgid ""
+ "Could not execute enblend, system() failed: \n"
+ "Command was :"
+@@ -782,15 +815,15 @@
+ "Nie można było uruchomić enblenda, system() zwrócił błąd: \n"
+ "Polecenie było :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:360
++#: src/hugin/NonaStitcherPanel.cpp:364
+ msgid "Error returned was :"
+ msgstr "Zwrócono błąd :"
+
+-#: src/hugin/NonaStitcherPanel.cpp:388
++#: src/hugin/NonaStitcherPanel.cpp:392
+ msgid "CreateProcess Error"
+ msgstr "Błąd CreateProcess"
+
+-#: src/hugin/NonaStitcherPanel.cpp:401
++#: src/hugin/NonaStitcherPanel.cpp:406
+ msgid "enblend error"
+ msgstr "błąd enblend"
+
+@@ -974,7 +1007,7 @@
+ msgid "width needs to be an integer bigger than 0"
+ msgstr "szerokość powinna być liczbą większą od 0"
+
+-#: src/hugin/PanoPanel.cpp:502
++#: src/hugin/PanoPanel.cpp:506
+ msgid "Create panorama image"
+ msgstr "Utwórz zdjęcie panoramiczne"
+
+@@ -1010,7 +1043,8 @@
+ msgid "Select PTStitcher"
+ msgstr "Wybierz PTStitcher"
+
+-#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:108
++#: src/hugin/PreferencesDialog.cpp:188 src/hugin/RunOptimizerFrame.cpp:109
++#: src/hugin/RunOptimizerFrame.cpp:123
+ msgid "Select PTOptimizer"
+ msgstr "Wybierz PTOptimizer"
+
+@@ -1150,33 +1184,33 @@
+ msgid "PTStitcher note"
+ msgstr "uwaga PTStitcher'a"
+
+-#: src/hugin/RunOptimizerFrame.cpp:116
++#: src/hugin/RunOptimizerFrame.cpp:117
+ msgid "No PTOptimizer.exe selected"
+ msgstr "Nie wybrano PTOptimizer.exe"
+
+-#: src/hugin/RunOptimizerFrame.cpp:140
++#: src/hugin/RunOptimizerFrame.cpp:131
++#, fuzzy
++msgid "No PTOptimizer selected"
++msgstr "Nie wybrano PTOptimizer.exe"
++
++#: src/hugin/RunOptimizerFrame.cpp:155
+ msgid "Failed to launch PTOptimizer."
+ msgstr "Błąd uruchamiania PTOptimizer"
+
+-#: src/hugin/RunOptimizerFrame.cpp:151
++#: src/hugin/RunOptimizerFrame.cpp:166
+ msgid "Could not obtain PTOptimizer output"
+ msgstr "Błąd w wyników rezultatu z PTOptimizer'a"
+
+-#: src/hugin/RunOptimizerFrame.cpp:161
++#: src/hugin/RunOptimizerFrame.cpp:176
+ msgid "Stop"
+ msgstr "Zatrzymaj"
+
+-#: src/hugin/RunOptimizerFrame.cpp:223
++#: src/hugin/RunOptimizerFrame.cpp:238
+ #, c-format
+ msgid "Strategy %d, Iteration %d, average distance: %f"
+ msgstr "Strategia %d, Iteracja %d, średnia odległość: %f"
+
+-#: src/hugin/RunOptimizerFrame.cpp:295 src/hugin/xrc/edit_text.xrs:3
+-#: src/hugin/xrc/pref_dialog.xrs:70
+-msgid "Cancel"
+-msgstr "Anuluj"
+-
+-#: src/hugin/RunOptimizerFrame.cpp:327
++#: src/hugin/RunOptimizerFrame.cpp:342
+ msgid ""
+ "Optimizer run finished.\n"
+ "WARNING: a very small Field of View (v) has been estimated\n"
+@@ -1200,7 +1234,7 @@
+ "równie dobrze,\n"
+ "gdy zdjęcia są już dobrze wyrównane."
+
+-#: src/hugin/RunOptimizerFrame.cpp:329
++#: src/hugin/RunOptimizerFrame.cpp:344
+ #, c-format
+ msgid ""
+ "Optimizer run finished.\n"
+@@ -1675,9 +1709,8 @@
+ msgstr "pionowy (e):"
+
+ #: src/hugin/xrc/lens_panel.xrs:35
+-#, fuzzy
+ msgid "Set Crop"
+-msgstr "Zatrzymaj"
++msgstr "Ustaw Ucięcie"
+
+ #: src/hugin/xrc/lens_panel.xrs:36
+ msgid "Set crop and image center"
+@@ -2468,7 +2501,7 @@
+
+ #: src/hugin/xrc/pref_dialog.xrs:42
+ msgid "Optimize and stitch only images selected in preview window"
+-msgstr ""
++msgstr "Optymalizuj i sklej tylko zdjęcia wybrane w oknie podglądu"
+
+ #: src/hugin/xrc/pref_dialog.xrs:43
+ msgid "File options"
+@@ -2547,15 +2580,11 @@
+
+ #: src/hugin/xrc/pref_dialog.xrs:66
+ msgid "Do not set -w and -o arguments, they are set by hugin"
+-msgstr "Nie dodawaj parametrów -w i -o, hugin same je doda"
++msgstr "Nie dodawaj parametrów -w i -o, hugin sam je doda"
+
+ #: src/hugin/xrc/pref_dialog.xrs:67
+ msgid "Delete remapped tiff files"
+-msgstr ""
+-
+-#: src/hugin/xrc/pref_dialog.xrs:68
+-msgid "Ok"
+-msgstr "Ok"
++msgstr "Usuń zremapowane zdjęcia tiff"
+
+ #: src/hugin/xrc/pref_dialog.xrs:71
+ msgid "Load Defaults"
+@@ -2745,9 +2774,3 @@
+ #: src/hugin/xrc/run_stitcher_frame.xrs:3
+ msgid "Abort"
+ msgstr "Anuluj"
+-
+-#~ msgid "Center dialog"
+-#~ msgstr "Wycentruj okno"
+-
+-#~ msgid "center image shifting it with d and e"
+-#~ msgstr "wypośrodkój zdjęcie przesuwając je przez d i e"
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/hugin/RunOptimizerFrame.cpp hugin/src/hugin/RunOptimizerFrame.cpp
+--- hugin-0.5-beta4/src/hugin/RunOptimizerFrame.cpp 2005-03-07 21:10:42.000000000 +0100
++++ hugin/src/hugin/RunOptimizerFrame.cpp 2005-03-30 12:48:41.000000000 +0200
+@@ -6,7 +6,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -30,6 +30,7 @@
+ #include "panoinc.h"
+ #include "common/wxPlatform.h"
+
++#include "hugin/config_defaults.h"
+ #include "hugin/CommandHistory.h"
+ #include "hugin/RunOptimizerFrame.h"
+ #include "hugin/huginApp.h"
+@@ -116,6 +117,20 @@
+ wxLogError(_("No PTOptimizer.exe selected"));
+ }
+ }
++#elif (defined __WXMAC__)
++ wxString optimizerExe = config->Read(wxT("/PanoTools/PTOptimizerExe"), wxT(HUGIN_PT_OPTIMIZER_EXE));
++ if (!wxFile::Exists(optimizerExe)){
++ wxFileDialog dlg(this,_("Select PTOptimizer"),
++ wxT(""), optimizerExe,
++ wxT("Any Files |*"),
++ wxOPEN, wxDefaultPosition);
++ if (dlg.ShowModal() == wxID_OK) {
++ optimizerExe = dlg.GetPath();
++ config->Write(wxT("/PanoTools/PTOptimizerExe"),optimizerExe);
++ } else {
++ wxLogError(_("No PTOptimizer selected"));
++ }
++ }
+ #else
+ wxString optimizerExe = config->Read(wxT("/PanoTools/PTOptimizerExe"),wxT("PTOptimizer"));
+ #endif
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/common/utils.h hugin/src/include/common/utils.h
+--- hugin-0.5-beta4/src/include/common/utils.h 2005-01-17 02:29:40.000000000 +0100
++++ hugin/src/include/common/utils.h 2005-04-24 18:48:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -34,14 +34,14 @@
+
+ #ifdef __WXMSW__
+ // has to be included before!
+-//#include <wx/log.h>
++#include <wx/log.h>
+
+ #define snprintf _snprintf
+ #endif
+
+ #ifdef WIN32
+ // has to be included before!
+-//#include <wx/log.h>
++#include <wx/log.h>
+
+ #define snprintf _snprintf
+ #endif
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/hugin/config_defaults.h hugin/src/include/hugin/config_defaults.h
+--- hugin-0.5-beta4/src/include/hugin/config_defaults.h 2005-03-07 21:09:29.000000000 +0100
++++ hugin/src/include/hugin/config_defaults.h 2005-04-12 18:54:48.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -56,7 +56,8 @@
+ #define HUGIN_GUI_SORT_IMG_BY_DATE 0l
+
+ // Program defaults
+-#ifdef WIN32
++#if defined WIN32
++
+ #define HUGIN_PT_STITCHER_EXE "PTStitcher.exe"
+ #define HUGIN_PT_OPTIMIZER_EXE "PTOptimizer.exe"
+
+@@ -68,9 +69,8 @@
+
+ #define HUGIN_APSIFT_EXE "autopano-win32.exe"
+
+-#endif
+
+-#ifdef __WXMAC__
++#elif defined __WXMAC__
+
+ #define HUGIN_PT_STITCHER_EXE "PTStitcher"
+ #define HUGIN_PT_OPTIMIZER_EXE "PTOptimizer"
+@@ -81,10 +81,11 @@
+ #define HUGIN_APKOLOR_EXE ""
+ #define HUGIN_APKOLOR_ARGS ""
+
+-#define HUGIN_APSIFT_EXE "autopano-complete.sh"
+-#endif
++#define HUGIN_APSIFT_EXE "autopano-complete-mac.sh"
++#define HUGIN_APSIFT_ARGS "-o %o -p %p %i"
+
+-#ifdef unix
++
++#elif defined unix
+
+ #define HUGIN_PT_STITCHER_EXE "PTStitcher"
+ #define HUGIN_PT_OPTIMIZER_EXE "PTOptimizer"
+@@ -97,12 +98,15 @@
+
+ #define HUGIN_APSIFT_EXE "autopanog.exe"
+
++
+ #endif
+
+ // enblend args
+ #define HUGIN_ENBLEND_ARGS "-v -z"
+
+ // Autopano-SIFT args
++#ifndef HUGIN_APSIFT_ARGS
+ #define HUGIN_APSIFT_ARGS "--output %o --imagelist %namefile"
++#endif
+
+ #endif // _CONFIG_DEFAULTS_H
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/hugin/CPEditorPanel.h hugin/src/include/hugin/CPEditorPanel.h
+--- hugin-0.5-beta4/src/include/hugin/CPEditorPanel.h 2005-02-22 11:09:10.000000000 +0100
++++ hugin/src/include/hugin/CPEditorPanel.h 2005-04-24 18:48:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -237,7 +237,7 @@
+ wxCheckBox *m_autoAddCB;
+ wxCheckBox *m_fineTuneCB;
+ wxCheckBox *m_estimateCB;
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ wxScrolledWindow *m_cp_ctrls;
+ wxSplitterWindow *m_cp_splitter;
+ #endif
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/hugin/ImagesPanel.h hugin/src/include/hugin/ImagesPanel.h
+--- hugin-0.5-beta4/src/include/hugin/ImagesPanel.h 2005-02-22 11:09:12.000000000 +0100
++++ hugin/src/include/hugin/ImagesPanel.h 2005-04-24 18:48:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Kai-Uwe Behrmann <web@tiscali.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -74,7 +74,7 @@
+ // event handlers
+ void OnAddImages(wxCommandEvent & e);
+ void OnRemoveImages(wxCommandEvent & e);
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ void OnPositionChanged(wxSplitterEvent& event);
+ #endif
+
+@@ -134,7 +134,7 @@
+ wxButton * m_matchingButton;
+ wxButton * m_removeCPButton;
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ wxScrolledWindow *m_img_ctrls;
+ wxSplitterWindow *m_img_splitter;
+ #endif
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/hugin/LensPanel.h hugin/src/include/hugin/LensPanel.h
+--- hugin-0.5-beta4/src/include/hugin/LensPanel.h 2005-02-22 11:09:12.000000000 +0100
++++ hugin/src/include/hugin/LensPanel.h 2005-04-24 18:48:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Kai-Uwe Behrmann <web@tiscali.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -124,7 +124,7 @@
+ int m_distDigitsEdit;
+ int m_pixelDigits;
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ wxScrolledWindow *m_lens_ctrls;
+ wxSplitterWindow *m_lens_splitter;
+ #endif
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/hugin/OptimizePanel.h hugin/src/include/hugin/OptimizePanel.h
+--- hugin-0.5-beta4/src/include/hugin/OptimizePanel.h 2005-03-07 21:09:29.000000000 +0100
++++ hugin/src/include/hugin/OptimizePanel.h 2005-04-24 18:48:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Pablo d'Angelo <pablo.dangelo@web.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -102,7 +102,7 @@
+ wxCheckBox * m_edit_cb;
+ wxChoice * m_mode_cb;
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ wxScrolledWindow *m_opt_ctrls;
+ #endif
+
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/hugin/PanoPanel.h hugin/src/include/hugin/PanoPanel.h
+--- hugin-0.5-beta4/src/include/hugin/PanoPanel.h 2005-02-22 11:09:17.000000000 +0100
++++ hugin/src/include/hugin/PanoPanel.h 2005-04-24 18:48:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ *
+ * @author Kai-Uwe Behrmann <web@tiscali.de>
+ *
+- * $Id$
++ * $Id$
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+@@ -140,7 +140,7 @@
+ wxButton * m_CalcHFOVButton;
+ wxButton * m_CalcOptWidthButton;
+
+-#ifdef USE_WX25x
++#ifdef USE_WX26x
+ wxScrolledWindow *m_pano_ctrls;
+ #endif
+
+diff -Nur -x CVS -x .cvsignore hugin-0.5-beta4/src/include/panoinc_WX.h hugin/src/include/panoinc_WX.h
+--- hugin-0.5-beta4/src/include/panoinc_WX.h 2005-02-22 11:09:06.000000000 +0100
++++ hugin/src/include/panoinc_WX.h 2005-04-24 18:48:12.000000000 +0200
+@@ -63,13 +63,15 @@
+ #include <wx/regex.h>
+ #include <wx/valtext.h>
+ #include <wx/valgen.h>
++
+ #if wxCHECK_VERSION(2,5,3)
+-#ifdef __WXGTK__
+-// At present we can only use wxSplitterWindows on GTK
+-#define USE_WX25x
+-#endif
+ #include <wx/imaglist.h>
+ #endif
++
++#if wxCHECK_VERSION(2,6,0)
++#define USE_WX26x
++#endif
++
+ // remove stupid #defines from the evil windows.h
+ #ifdef __WXMSW__
+ #include <wx/msw/winundef.h>
projects / packages / hugin.git / commitdiff