diff -Nru hugin-2017.0.0~beta1+dfsg/CMakeLists.txt hugin-2017.0.0+dfsg/CMakeLists.txt --- hugin-2017.0.0~beta1+dfsg/CMakeLists.txt 2017-05-06 12:09:50.000000000 +0000 +++ hugin-2017.0.0+dfsg/CMakeLists.txt 2017-05-15 15:05:31.000000000 +0000 @@ -12,7 +12,6 @@ endif(COMMAND cmake_policy) if(APPLE) - set(CMAKE_OSX_SYSROOT macosx10.12) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") if (MAC_SELF_CONTAINED_BUNDLE) set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/lib) @@ -491,6 +490,12 @@ ENDIF(LAPACK_FOUND) ENDIF(ENABLE_LAPACK) +OPTION(USE_GDKBACKEND_X11 "Enforce GDK_BACKEND=x11 for Hugin as workaround for wxWidgets bug (not supporting wxGLCanvas on Wayland)" OFF) +IF(USE_GDKBACKEND_X11) + ADD_DEFINITIONS(-DUSE_GDKBACKEND_X11) + MESSAGE(STATUS "Compiling Hugin with hard coded GDK_BACKEND=x11") +ENDIF() + # vips is not used right now #IF (WIN32) # # todo: check for vips (not needed right now) @@ -668,10 +673,6 @@ IF(MAC_SELF_CONTAINED_BUNDLE) SET(CMAKE_MACOSX_RPATH FALSE) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMakeModules/PackageMacAppBundleLibs.sh.in - ${hugin_BINARY_DIR}/${BINDIR}/PackageMacAppBundleLibs.sh @ONLY IMMEDIATE) - - ADD_CUSTOM_TARGET(Mac ALL) SET(APPS Hugin PTBatcherGUI calibrate_lens_gui HuginStitchProject) SET(APPS_DIR ${CMAKE_BINARY_DIR}/src/hugin1/hugin @@ -685,8 +686,8 @@ ADD_DEPENDENCIES(Mac ${_target}) ADD_CUSTOM_COMMAND( TARGET Mac - COMMAND bash ${hugin_BINARY_DIR}/${BINDIR}/PackageMacAppBundleLibs.sh - ARGS ${_target} ${_target_dir} + COMMAND bash ${CMAKE_SOURCE_DIR}/mac/PackageMacAppBundleLibs.sh + ARGS ${_target} ${_target_dir} ${CMAKE_SOURCE_DIR} ) ENDFOREACH(_var) @@ -696,7 +697,7 @@ COMMAND ${CMAKE_SOURCE_DIR}/mac/PackageCreateToolsLibs.sh ARGS ${CMAKE_CURRENT_BINARY_DIR}/tools_mac fulla tca_correct vig_optimize hugin_lensdb hugin_executor pano_trafo pto_gen - pto_lensstack pto_mask pto_merge pto_move pto_template pto_var deghosting_mask) + pto_lensstack pto_mask pto_merge pto_move pto_template pto_var deghosting_mask :enblend :enfuse) INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tools_mac DESTINATION Hugin @@ -883,8 +884,8 @@ #has to be 72dpi SET(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/mac/DmgBackground.jpg") - # SET(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_SOURCE_DIR}/mac/DmgScript.scpt") - SET(CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/mac/DmgDS_Store.in") + SET(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_SOURCE_DIR}/mac/DmgScript.scpt") + # SET(CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/mac/DmgDS_Store.in") ENDIF(APPLE) diff -Nru hugin-2017.0.0~beta1+dfsg/CMakeModules/PackageMacAppBundleLibs.sh.in hugin-2017.0.0+dfsg/CMakeModules/PackageMacAppBundleLibs.sh.in --- hugin-2017.0.0~beta1+dfsg/CMakeModules/PackageMacAppBundleLibs.sh.in 2017-04-22 17:02:42.000000000 +0000 +++ hugin-2017.0.0+dfsg/CMakeModules/PackageMacAppBundleLibs.sh.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -#!/bin/bash - -# This script attempts to copy needed 3rd party libraries and frameworks into -# the application bundle. It will then attempt to set the 'install_name' for -# each library so that it references either the PlugIns or Frameworks directory. -# The Script will change every library it can find. Each of these libraries -# needs to have an absolute install path so we can copy it. - -BASE_DIR="$2" -cd ${BASE_DIR} - -APPLICATION_NAME="$1" -APPLICATION_APP_BUNDLE="${APPLICATION_NAME}.app" - APPLICATION_BINDIR="${APPLICATION_APP_BUNDLE}/Contents/MacOS" -APPLICATION_APP_NAME="${APPLICATION_BINDIR}/${APPLICATION_NAME}" - PLUGINS_PATH="${APPLICATION_APP_BUNDLE}/Contents/Libraries" -FRAMEWORKS_PATH="${APPLICATION_APP_BUNDLE}/Contents/Frameworks" -RPATH_PLUGIN_PATH="@executable_path/../Libraries" -RPATH_FRAMEWORK_PATH="@executable_path/../Frameworks" - - -echo "*-----------------------------------------------------------*" -echo "* Copying Support Libraries for ${APPLICATION_APP_BUNDLE}" -echo "* Located in ${BASE_DIR}" - -mkdir -p "${PLUGINS_PATH}" -mkdir -p "${FRAMEWORKS_PATH}" - -get_libraries() { - local LIBRARIES=$(echo $(otool -L $1 | grep -v ${RPATH_PLUGIN_PATH} - | grep -v \/System\/Library - | grep -v \/usr\/lib - | sed -ne '1!p' | sed -e 's/(.*)//' | sort -u)) - if [ -n "$LIBRARIES" ]; then - for library in $LIBRARIES - do - update_library $library $1 - done - fi - install_name_tool -delete_rpath "@CMAKE_SOURCE_DIR@/mac/ExternalPrograms/repository/lib" $1 2&>/dev/null -} - -update_library() { - local lib="$1" - local lib_file=$(basename ${lib}) - local bin="$2" - if [ ! -f "${BASE_DIR}/${PLUGINS_PATH}/${lib_file}" ] - then - echo "* Installing Library -->$1<-- into ${APPLICATION_APP_BUNDLE} " - cp "${lib}" "${BASE_DIR}/${PLUGINS_PATH}" || exit 1 - chmod 755 "${BASE_DIR}/${PLUGINS_PATH}/${lib_file}" - get_libraries "${BASE_DIR}/${PLUGINS_PATH}/${lib_file}" - install_name_tool -id "${RPATH_PLUGIN_PATH}/${lib_file}" "${BASE_DIR}/${PLUGINS_PATH}/${lib_file}" - fi - install_name_tool -change "${lib}" "${RPATH_PLUGIN_PATH}/${lib_file}" "${bin}" -} - - -# ----------------------------------------------------------------------------- -# Copy libraries for all exetuables in APPLICATION_BINDIR -# ----------------------------------------------------------------------------- - -for _exe in ${BASE_DIR}/${APPLICATION_BINDIR}/*; do - get_libraries $_exe -done - - -# ----------------------------------------------------------------------------- -# Copy ExifTool into the stitchers -# ----------------------------------------------------------------------------- -if [ "${APPLICATION_APP_BUNDLE}" == "PTBatcherGUI.app" ] || [ "${APPLICATION_APP_BUNDLE}" == "HuginStitchProject.app" ]; then - - if [ ! -x "${APPLICATION_APP_BUNDLE}/Contents/Resources/ExifTool/exiftool" ]; then - echo "* Installing ExifTool into ${APPLICATION_APP_BUNDLE} " - mkdir -p "${APPLICATION_APP_BUNDLE}/Contents/Resources/ExifTool" - cp -v "@CMAKE_SOURCE_DIR@/mac/ExternalPrograms/repository/"Image-ExifTool-*/exiftool "${APPLICATION_APP_BUNDLE}/Contents/Resources/ExifTool" - cp -r "@CMAKE_SOURCE_DIR@/mac/ExternalPrograms/repository/"Image-ExifTool-*/lib "${APPLICATION_APP_BUNDLE}/Contents/Resources/ExifTool" - fi - -fi - diff -Nru hugin-2017.0.0~beta1+dfsg/debian/changelog hugin-2017.0.0+dfsg/debian/changelog --- hugin-2017.0.0~beta1+dfsg/debian/changelog 2017-05-07 13:27:18.000000000 +0000 +++ hugin-2017.0.0+dfsg/debian/changelog 2017-07-09 13:03:13.000000000 +0000 @@ -1,3 +1,33 @@ +hugin (2017.0.0+dfsg-0ubuntu1~trusty) trusty; urgency=medium + + * New upstream release packaged for trusty. + + -- Stefan Peter Sun, 09 Jul 2017 15:01:59 +0200 + +hugin (2017.0.0~rc2+dfsg-1ubuntu1~trusty) trusty; urgency=medium + + * New upstream version packaged for trusty. + + -- Stefan Peter Sun, 18 Jun 2017 11:45:54 +0200 + +hugin (2017.0.0~rc2+dfsg-1) experimental; urgency=low + + * New upstream version. + + -- Andreas Metzler Sat, 17 Jun 2017 13:11:35 +0200 + +hugin (2017.0.0~rc1+dfsg-1ubuntu1~trusty) trusty; urgency=medium + + * New upstream version packaged for trusty. + + -- Stefan Peter Sun, 04 Jun 2017 12:51:56 +0200 + +hugin (2017.0.0~rc1+dfsg-1) experimental; urgency=medium + + * New upstream version. + + -- Andreas Metzler Sat, 03 Jun 2017 13:12:06 +0200 + hugin (2017.0.0~beta1+dfsg-1ubuntu1~trusty) trusty; urgency=medium * New upstream version packaged for trusty. diff -Nru hugin-2017.0.0~beta1+dfsg/debian/control hugin-2017.0.0+dfsg/debian/control --- hugin-2017.0.0~beta1+dfsg/debian/control 2017-05-07 13:27:18.000000000 +0000 +++ hugin-2017.0.0+dfsg/debian/control 2017-07-09 13:03:13.000000000 +0000 @@ -19,7 +19,7 @@ libflann-dev, libfftw3-dev, libvigraimpex-dev (>=1.9), liblcms2-dev Build-Conflicts: wx2.6-headers, wx2.8-headers -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: http://hugin.sourceforge.net/ Vcs-Git: https://anonscm.debian.org/git/pkg-phototools/hugin.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-phototools/hugin.git diff -Nru hugin-2017.0.0~beta1+dfsg/rev.txt hugin-2017.0.0+dfsg/rev.txt --- hugin-2017.0.0~beta1+dfsg/rev.txt 2017-05-06 12:10:22.000000000 +0000 +++ hugin-2017.0.0+dfsg/rev.txt 2017-06-16 16:55:08.000000000 +0000 @@ -1 +1 @@ -4fe670950b16 \ No newline at end of file +eac5e8cc546e \ No newline at end of file diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp hugin-2017.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp 2017-05-27 14:37:46.000000000 +0000 @@ -980,6 +980,40 @@ }; return true; }; + +#ifdef __WXMSW__ + // search for executable in program folder and in PATH + // add exe extension if no one is given + wxString GetProgname(const wxString& bindir, const wxString& name) + { + wxFileName prog(name); + if (prog.IsAbsolute()) + { + if (prog.FileExists()) + { + return prog.GetFullPath(); + }; + } + else + { + // search in program folder and in PATH + const bool hasExt = prog.HasExt(); + if(!prog.HasExt()) + { + prog.SetExt("exe"); + }; + wxPathList pathlist; + pathlist.Add(bindir); + pathlist.AddEnvList(wxT("PATH")); + const wxString fullName = pathlist.FindAbsoluteValidPath(prog.GetFullName()); + if (!fullName.IsEmpty()) + { + return fullName; + }; + }; + return name; + }; +#endif } CommandQueue* GetStitchingCommandQueueUserOutput(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, const wxString& outputSettings, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete) @@ -1336,13 +1370,22 @@ CleanQueue(commands); return commands; } - const wxString prog = detail::GetSettingString(settings, wxT("Program")); - if (prog.IsEmpty()) + const wxString progName = detail::GetSettingString(settings, wxT("Program")); + if (progName.IsEmpty()) { std::cerr << "ERROR: Step " << i << " has no program name specified." << std::endl; CleanQueue(commands); return commands; }; +#ifdef __WXMAC__ + // check if program can be found in bundle + const wxString prog = GetExternalProgram(wxConfig::Get(), ExePath, progName); +#elif defined __WXMSW__ + + const wxString prog = detail::GetProgname(ExePath, progName); +#else + const wxString prog = progName; +#endif if (inputFiles.CmpNoCase(wxT("all")) == 0) { for (size_t imgNr = 0; imgNr < remappedImages.size(); ++imgNr) diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/huginApp.cpp hugin-2017.0.0+dfsg/src/hugin1/hugin/huginApp.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/huginApp.cpp 2017-04-22 17:02:49.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/huginApp.cpp 2017-05-13 11:57:54.000000000 +0000 @@ -132,7 +132,24 @@ END_EVENT_TABLE() // make wxwindows use this class as the main application -IMPLEMENT_APP(huginApp) +#if defined USE_GDKBACKEND_X11 +// wxWidgets does not support wxGLCanvas on Wayland +// so until it is fixed upstream enforce using x11 backend +// see ticket http://trac.wxwidgets.org/ticket/17702 +#warning Using Hugin with hard coded GDK_BACKEND=x11 +wxIMPLEMENT_WX_THEME_SUPPORT +wxIMPLEMENT_APP_NO_MAIN(huginApp); +#include +int main(int argc, char **argv) +{ + wxDISABLE_DEBUG_SUPPORT(); + char backend[]="GDK_BACKEND=x11"; + putenv(backend); + return wxEntry(argc, argv); +}; +#else +wxIMPLEMENT_APP(huginApp); +#endif huginApp::huginApp() { diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/ImagesTree.cpp hugin-2017.0.0+dfsg/src/hugin1/hugin/ImagesTree.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/ImagesTree.cpp 2017-05-06 12:09:50.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/ImagesTree.cpp 2017-05-25 08:44:56.000000000 +0000 @@ -1841,6 +1841,16 @@ }; break; }; +#if defined __WXMAC__ + case 'A': + case 'a': + // check for cmd+A -> select all + if (e.GetExtraLong() == wxMOD_CMD) + { + SelectAll(); + }; + break; +#endif case 1: //Ctrl+A { SelectAll(); diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/MainFrame.cpp hugin-2017.0.0+dfsg/src/hugin1/hugin/MainFrame.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/MainFrame.cpp 2017-04-22 17:02:46.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/MainFrame.cpp 2017-06-10 07:26:15.000000000 +0000 @@ -437,7 +437,7 @@ { // we found some files long outputId = wxIDUSEROUTPUTSEQUENCE; - int outputMenuId=mainMenu->FindMenu(_("Output")); + int outputMenuId=mainMenu->FindMenu(_("&Output")); if (outputMenuId != wxNOT_FOUND) { wxMenu* outputSequencesMenu = new wxMenu; @@ -1910,7 +1910,11 @@ theMenuBar->Enable(XRCID("ID_SHOW_PREVIEW_FRAME"), option); theMenuBar->Enable(XRCID("action_stitch"), option); theMenuBar->Enable(XRCID("action_stitch_userdefined"), option); - theMenuBar->Enable(theMenuBar->FindMenuItem(_("Output"), _("User defined output sequences")), option); + const int userOutputMenuId = theMenuBar->FindMenuItem(_("&Output"), _("User defined output sequences")); + if (userOutputMenuId != wxNOT_FOUND) + { + theMenuBar->Enable(userOutputMenuId, option); + }; m_menu_file_advanced->Enable(XRCID("action_import_papywizard"), option); //theMenuBar->Enable(XRCID("ID_SHOW_GL_PREVIEW_FRAME"), option); } @@ -2255,7 +2259,7 @@ //if return value is non-zero, an error occurred in the assistant if(ret!=0) { - if (pano.getNrOfImages()) + if (pano.getNrOfImages() == 1) { wxMessageBox(_("The assistant could not find vertical lines. Please add vertical lines in the panorama editor and optimize project manually."), _("Warning"), wxOK | wxICON_INFORMATION, mainWin); diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp hugin-2017.0.0+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp 2017-04-22 17:02:46.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp 2017-06-15 16:52:43.000000000 +0000 @@ -285,7 +285,7 @@ m_editImg->setImage(m_File,m_currentMasks,masksToDraw,GetRot(imgNr)); else m_editImg->setNewMasks(m_currentMasks,masksToDraw); - if(m_currentMasks.size()==0) + if (m_currentMasks.empty() || m_MaskNr >= m_currentMasks.size()) setMask(UINT_MAX); // enables or disables controls bool enableCtrl=(imgNrSetValue(wxConfigBase::Get()->Read(wxT("/OptimizeOptimizePhotometricPanelPanel/OnlyActiveImages"),1l) != 0); + m_only_active_images_cb->SetValue(wxConfigBase::Get()->Read(wxT("/OptimizePhotometricPanel/OnlyActiveImages"),1l) != 0); m_images_tree = XRCCTRL(*this, "optimize_photo_panel_images", ImagesTreeCtrl); DEBUG_ASSERT(m_images_tree); diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/PanoOperation.cpp hugin-2017.0.0+dfsg/src/hugin1/hugin/PanoOperation.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/PanoOperation.cpp 2017-04-22 17:02:47.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/PanoOperation.cpp 2017-05-23 17:28:22.000000000 +0000 @@ -505,19 +505,14 @@ PanoCommand::PanoCommand* LoadLensOperation::GetInternalCommand(wxWindow* parent, HuginBase::Panorama& pano, HuginBase::UIntSet images) { HuginBase::StandardImageVariableGroups variable_groups(pano); - if(images.size()==1) + HuginBase::UIntSet lensImages = variable_groups.getLenses().getPartsSet()[variable_groups.getLenses().getPartNumber(*images.begin())]; + if (!m_fromDatabase && images.size() == 1 && lensImages.size() > 1) { + // database is always linking the parameters, so no need to ask user if(wxMessageBox(_("You selected only one image.\nShould the loaded parameters be applied to all images with the same lens?"),_("Question"), wxICON_QUESTION | wxYES_NO)==wxYES) { - unsigned int lensNr = variable_groups.getLenses().getPartNumber(*images.begin()); // get all images with the current lens. - for (size_t i = 0; i < pano.getNrOfImages(); i++) - { - if (variable_groups.getLenses().getPartNumber(i) == lensNr) - { - images.insert(i); - }; - }; + std::copy(lensImages.begin(), lensImages.end(), std::inserter(images, images.end())); }; }; vigra::Size2D sizeImg0=pano.getImage(*(images.begin())).getSize(); diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/treelistctrl.cpp hugin-2017.0.0+dfsg/src/hugin1/hugin/treelistctrl.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/treelistctrl.cpp 2017-04-22 17:02:49.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/treelistctrl.cpp 2017-05-25 08:44:56.000000000 +0000 @@ -3608,6 +3608,8 @@ wxTreeEvent nevent (wxEVT_COMMAND_TREE_KEY_DOWN, 0 ); nevent.SetInt(m_curColumn); nevent.SetKeyEvent (event); + // store modifiers in extra long for Mac + nevent.SetExtraLong(event.GetModifiers()); if (SendEvent(0, NULL, &nevent)) return; // char event handled in user code // if no item current, select root diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc hugin-2017.0.0+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc 2011-07-17 08:39:25.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc 2017-05-25 08:44:57.000000000 +0000 @@ -450,6 +450,7 @@ Saves the images and lines as pto file for further tuning inside hugin. + Ctrl+shift+s diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/xrc/main_menu.xrc hugin-2017.0.0+dfsg/src/hugin1/hugin/xrc/main_menu.xrc --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/xrc/main_menu.xrc 2016-10-03 07:51:45.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/xrc/main_menu.xrc 2017-05-25 08:44:57.000000000 +0000 @@ -183,6 +183,7 @@ + Ctrl-Shift-s Save current project to a new file diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc hugin-2017.0.0+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc --- hugin-2017.0.0~beta1+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc 2016-10-03 07:51:45.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc 2017-05-25 08:44:57.000000000 +0000 @@ -1114,6 +1114,7 @@ Save current project to a new file + Ctrl+shift+s @@ -1155,6 +1156,7 @@ Save current project to a new file + Ctrl+shift+s diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp hugin-2017.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp 2017-04-22 17:03:06.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp 2017-05-13 11:57:54.000000000 +0000 @@ -32,7 +32,24 @@ #include "lensdb/LensDB.h" // make wxwindows use this class as the main application -IMPLEMENT_APP(PTBatcherGUI) +#if defined USE_GDKBACKEND_X11 +// wxWidgets does not support wxTaskBarIcon::IsAvailable on Wayland +// so until it is fixed upstream enforce using x11 backendj +// see ticket http://trac.wxwidgets.org/ticket/17779 +#warning Using Hugin with hard coded GDK_BACKEND=x11 +wxIMPLEMENT_WX_THEME_SUPPORT +wxIMPLEMENT_APP_NO_MAIN(PTBatcherGUI); +#include +int main(int argc, char **argv) +{ + wxDISABLE_DEBUG_SUPPORT(); + char backend[]="GDK_BACKEND=x11"; + putenv(backend); + return wxEntry(argc, argv); +}; +#else +wxIMPLEMENT_APP(PTBatcherGUI); +#endif BEGIN_EVENT_TABLE(PTBatcherGUI, wxApp) EVT_LIST_ITEM_ACTIVATED(XRCID("project_listbox"),PTBatcherGUI::OnItemActivated) diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin_base/hugin_utils/utils.cpp hugin-2017.0.0+dfsg/src/hugin_base/hugin_utils/utils.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin_base/hugin_utils/utils.cpp 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin_base/hugin_utils/utils.cpp 2017-05-23 17:28:21.000000000 +0000 @@ -393,6 +393,21 @@ #endif }; +bool IsFileTypeSupported(const std::string& filename) +{ + const std::string extension = getExtension(filename); + return (vigra::impexListExtensions().find(extension) != std::string::npos); +}; + +void EnforceExtension(std::string& filename, const std::string& defaultExtension) +{ + const std::string extension = getExtension(filename); + if (extension.empty()) + { + filename = stripExtension(filename) + "." + defaultExtension; + }; +}; + std::string GetDataDir() { #ifdef _WIN32 diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin_base/hugin_utils/utils.h hugin-2017.0.0+dfsg/src/hugin_base/hugin_utils/utils.h --- hugin-2017.0.0~beta1+dfsg/src/hugin_base/hugin_utils/utils.h 2016-01-24 08:50:34.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin_base/hugin_utils/utils.h 2017-05-23 17:28:21.000000000 +0000 @@ -208,6 +208,12 @@ /** returns the full absolute filename */ IMPEX std::string GetAbsoluteFilename(const std::string& filename); + /** return true, if file type by extension is supported by vigra */ + IMPEX bool IsFileTypeSupported(const std::string& filename); + + /** check if filename contains extension, if not add default extension */ + IMPEX void EnforceExtension(std::string& filename, const std::string& defaultExtension); + /** returns the full path to the data directory */ IMPEX std::string GetDataDir(); diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin_base/lensdb/LensDB.cpp hugin-2017.0.0+dfsg/src/hugin_base/lensdb/LensDB.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin_base/lensdb/LensDB.cpp 2016-03-18 18:53:55.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin_base/lensdb/LensDB.cpp 2017-06-15 16:52:43.000000000 +0000 @@ -2561,6 +2561,11 @@ if (lenses.getLenses().getNumberOfParts() == 1) { const SrcPanoImage& img0 = pano.getImage(0); + // if the HFOV for a rectilinear lens is too big, ignore this settings + if (img0.getProjection() == BaseSrcPanoImage::RECTILINEAR && img0.getHFOV() > 110) + { + return false; + }; LensDB& lensDB = LensDB::GetSingleton(); const std::string camMaker = img0.getExifMake(); const std::string camModel = img0.getExifModel(); diff -Nru hugin-2017.0.0~beta1+dfsg/src/hugin_base/panodata/SrcPanoImage.cpp hugin-2017.0.0+dfsg/src/hugin_base/panodata/SrcPanoImage.cpp --- hugin-2017.0.0~beta1+dfsg/src/hugin_base/panodata/SrcPanoImage.cpp 2017-04-22 17:03:08.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/hugin_base/panodata/SrcPanoImage.cpp 2017-06-15 16:52:43.000000000 +0000 @@ -680,10 +680,15 @@ double fov; if (lensDB.GetFov(lensname, focal, fov)) { - // calculate FOV for given image, take different aspect ratios into account - const double newFocal = calcFocalLength(getProjection(), fov, getCropFactor(), vigra::Size2D(3000,2000)); - const double newFov = calcHFOV(getProjection(), newFocal, getCropFactor(), getSize()); - setHFOV(newFov); + // ignore values if fov is bigger than 120 deg + // then probably an invalid value was written earlier + if (getProjection() == RECTILINEAR && fov < 120) + { + // calculate FOV for given image, take different aspect ratios into account + const double newFocal = calcFocalLength(getProjection(), fov, getCropFactor(), vigra::Size2D(3000, 2000)); + const double newFov = calcHFOV(getProjection(), newFocal, getCropFactor(), getSize()); + setHFOV(newFov); + }; }; vigra::Rect2D dbCropRect; if (lensDB.GetCrop(lensname, focal, getSize(), dbCropRect)) diff -Nru hugin-2017.0.0~beta1+dfsg/src/tools/verdandi.cpp hugin-2017.0.0+dfsg/src/tools/verdandi.cpp --- hugin-2017.0.0~beta1+dfsg/src/tools/verdandi.cpp 2017-04-22 17:03:11.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/tools/verdandi.cpp 2017-05-23 17:28:21.000000000 +0000 @@ -40,7 +40,16 @@ exportImageInfo.setPixelType(pixelType.c_str()); if (vigra::isBandNumberSupported(filetype, inputNumberBands)) { - vigra::exportImageAlpha(vigra::srcImageRange(image, roi), vigra::srcImage(mask, roi.upperLeft()), exportImageInfo); + try + { + vigra::exportImageAlpha(vigra::srcImageRange(image, roi), vigra::srcImage(mask, roi.upperLeft()), exportImageInfo); + } + catch (std::exception& e) + { + std::cerr << "ERROR: Could not save " << exportImageInfo.getFileName() << std::endl + << "Cause: " << e.what() << std::endl; + return false; + }; return true; } else @@ -49,12 +58,21 @@ { std::cout << "Warning: Filetype " << filetype << " does not support alpha channels." << std::endl << "Saving image without alpha channel." << std::endl; - vigra::exportImage(vigra::srcImageRange(image, roi), exportImageInfo); + try + { + vigra::exportImage(vigra::srcImageRange(image, roi), exportImageInfo); + } + catch (std::exception& e) + { + std::cerr << "ERROR: Could not save " << exportImageInfo.getFileName() << std::endl + << "Cause: " << e.what() << std::endl; + return false; + }; return true; } else { - std::cerr << "Error: Output filetype " << filetype << " does not support " << inputNumberBands << " channels." << std::endl + std::cerr << "ERROR: Output filetype " << filetype << " does not support " << inputNumberBands << " channels." << std::endl << "Can't save image." << std::endl; }; }; @@ -307,7 +325,7 @@ if (files.empty()) { - std::cerr << "Error: " << hugin_utils::stripPath(argv[0]) << " needs at least one image." << std::endl; + std::cerr << "ERROR: " << hugin_utils::stripPath(argv[0]) << " needs at least one image." << std::endl; return 1; }; @@ -315,6 +333,13 @@ { output = "final.tif"; }; + hugin_utils::EnforceExtension(output, "tif"); + if (!hugin_utils::IsFileTypeSupported(output)) + { + std::cerr << "ERROR: Extension \"" << hugin_utils::getExtension(output) << "\" is unknown." << std::endl; + return 1; + }; + bool success = false; if (files.size() == 1) diff -Nru hugin-2017.0.0~beta1+dfsg/src/translations/fr.po hugin-2017.0.0+dfsg/src/translations/fr.po --- hugin-2017.0.0~beta1+dfsg/src/translations/fr.po 2017-04-29 16:05:51.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/translations/fr.po 2017-05-25 08:41:14.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: Hugin 2012-0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2017-04-29 10:16+0200\n" -"PO-Revision-Date: 2016-06-24 21:46+0200\n" +"PO-Revision-Date: 2017-05-24 22:42+0200\n" "Last-Translator: pmllc \n" "Language-Team: French \n" "Language: fr\n" @@ -842,13 +842,12 @@ "projets sont en niveau de gris." #: hugin1/base_wx/wxPanoCommand.cpp:299 -#, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " "again." msgstr "" -"Hugin ne supporte pas le mélange de mode de couleur. Cette image sera " +"Hugin ne supporte pas ce mélange de mode de couleur. Cette image sera " "ignorée.\n" "Veuillez convertir cette image en niveau de gris ou en couleur et essayez de " "la recharger." @@ -2515,14 +2514,13 @@ msgstr "Sortie" #: hugin1/hugin/MainFrame.cpp:462 -#, fuzzy, c-format +#, c-format msgid "User defined sequence: %s" -msgstr "Ouverture de la séquence définie par l’utilisateur impossible « %s »." +msgstr "Séquence utilisateur : « %s »." #: hugin1/hugin/MainFrame.cpp:478 hugin1/hugin/MainFrame.cpp:1913 -#, fuzzy msgid "User defined output sequences" -msgstr "Ouverture de la séquence définie par l’utilisateur impossible « %s »." +msgstr "Sortie des séquences utilisateurs" #: hugin1/hugin/MainFrame.cpp:572 msgid "Started" @@ -2540,16 +2538,16 @@ msgstr "Exposition" #: hugin1/hugin/MainFrame.cpp:767 -#, fuzzy msgid "Save changes to the panorama before opening an other project?" msgstr "" -"Faut-il enregistrer les modifications apportées au panorama avant de fermer ?" +"Faut-il enregistrer les modifications apportées au panorama avant d'ouvrir " +"un autre projet ?" #: hugin1/hugin/MainFrame.cpp:770 -#, fuzzy msgid "Save changes to the panorama before starting a new project?" msgstr "" -"Faut-il enregistrer les modifications apportées au panorama avant de fermer ?" +"Faut-il enregistrer les modifications apportées au panorama avant de " +"commencer un nouveau projet ?" #: hugin1/hugin/MainFrame.cpp:774 msgid "Save changes to the panorama before closing?" @@ -2557,31 +2555,28 @@ "Faut-il enregistrer les modifications apportées au panorama avant de fermer ?" #: hugin1/hugin/MainFrame.cpp:787 -#, fuzzy msgid "" "If you load an other project without saving, your changes since your last " "save will be discarded." msgstr "" -"Si vous fermez sans enregistrer, les modifications apportées depuis la " -"dernière sauvegarde seront perdues" +"Si vous chargez un autre projet sans enregistrer les modifications apportées " +"depuis la dernière sauvegarde, celles-ci seront perdues." #: hugin1/hugin/MainFrame.cpp:790 -#, fuzzy msgid "" "If you start a new project without saving, your changes since your last save " "will be discarded." msgstr "" -"Si vous fermez sans enregistrer, les modifications apportées depuis la " -"dernière sauvegarde seront perdues" +"Si vous commencez un autre projet sans enregistrer les modifications " +"apportées depuis la dernière sauvegarde, celles-ci seront perdues." #: hugin1/hugin/MainFrame.cpp:794 -#, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -"Si vous fermez sans enregistrer, les modifications apportées depuis la " -"dernière sauvegarde seront perdues" +"Si vous fermez sans enregistrer les modifications apportées depuis la " +"dernière sauvegarde, celles-ci seront perdues." #: hugin1/hugin/MainFrame.cpp:799 msgid "Don't Save" @@ -2674,6 +2669,9 @@ "This file is not a valid image.\n" "This file will be removed from the project." msgstr "" +"Impossible de charger le fichier image \"%s\".\n" +"Ce fichier n'est reconnu comme une image valide.\n" +"Ce fichier sera supprimé du projet." #: hugin1/hugin/MainFrame.cpp:1246 #, c-format @@ -2682,6 +2680,10 @@ "This file was renamed, deleted or is on a non-accessible drive.\n" "This file will be removed from the project." msgstr "" +"Impossible de charger le fichier image \"%s\".\n" +"Ce fichier a été renommé, supprimé ou est stocké sur un espace de stockage " +"non accessible.\n" +"Ce fichier sera supprimé du projet." #: hugin1/hugin/MainFrame.cpp:1571 #, c-format @@ -2821,6 +2823,8 @@ "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" +"L'assistant ne trouve pas de lignes verticales. Merci d'en ajouter dans " +"l'éditeur de panorama et de lancer manuellement l'optimisation." #: hugin1/hugin/MainFrame.cpp:2275 #, c-format @@ -3627,22 +3631,21 @@ msgstr "Impossible d’enregistrer le fichier de projet « %s »." #: hugin1/hugin/PreferencesDialog.cpp:447 -#, fuzzy, c-format +#, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" "Le fichier %s n’existe pas.\n" -"Faut-il créer un fichier de paramètres vide ?" +"Faut-il créer un fichier de paramètres avec les valeurs par défaut ?" #: hugin1/hugin/PreferencesDialog.cpp:462 -#, fuzzy msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" "Pas de fichier sélectionné.\n" -"Faut-il créer un fichier de paramètres vide ?" +"Faut-il créer un fichier de paramètres avec les valeurs par défaut ?" #: hugin1/hugin/PreferencesDialog.cpp:781 msgid "Really reset displayed preferences to default values?" @@ -3794,6 +3797,9 @@ "Error: %s\n" "One cause could be an invalid or missing image file." msgstr "" +"Impossible d'assembler la prévisualisation.\n" +"Erreur : %s\n" +"Une raison possible est une image invalide ou manquante." #: hugin1/hugin/huginApp.cpp:218 #, c-format @@ -4208,9 +4214,8 @@ msgstr "Veuillez sélectionner un projet" #: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 -#, fuzzy msgid "Please select only one project" -msgstr "Veuillez sélectionner un projet" +msgstr "Veuillez sélectionner seulement et uniquement un projet" #: hugin1/ptbatcher/BatchFrame.cpp:647 msgid "Specify batch file to open" @@ -5875,9 +5880,8 @@ msgstr "Ajus&ter avec précision tous les points" #: hugin1/hugin/xrc/main_menu.xrc:40 -#, fuzzy msgid "Runs fine-tune on all control points." -msgstr "Supprimer %lu points de contrôle" +msgstr "Lancer l'ajustement précis sur tout les points de contrôle." #: hugin1/hugin/xrc/main_menu.xrc:43 msgid "Remove control points in masks" @@ -6892,7 +6896,7 @@ msgstr "Préfixe de sortie par défaut :" #: hugin1/hugin/xrc/pref_dialog.xrc:230 -#, fuzzy, c-format +#, c-format msgid "" "The following placeholders are replaced automatically:\n" "%firstimage - filename of first image file\n" @@ -7216,16 +7220,19 @@ "To create an example argfile leave the text boxes empty and press \"Edit..." "\"." msgstr "" +"Ces fichiers de paramètres sont utilisés pour copier les métadonnées d'un " +"fichier image vers le panorama final.\n" +"Laisser la zone de saisie vide pour utiliser les valeurs par défaut.\n" +"Pour créer un exemple de fichier de configuration, laissez la zone de saisie " +"vide et cliquez sur \"Éditer…\"." #: hugin1/hugin/xrc/pref_dialog.xrc:955 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" "Le fichier de paramètres suivant sera utilisé pour copier des mots-clés " -"depuis la première image vers toutes les images intermédiaires.\n" -"Les marques substitutives ne seront pas remplacées." +"depuis la première image vers toutes les images intermédiaires." #: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Intermediate ExifTool argfile:" @@ -7240,7 +7247,6 @@ msgstr "Modifier le fichier de paramètres d’ExifTool sélectionné" #: hugin1/hugin/xrc/pref_dialog.xrc:1013 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7249,9 +7255,7 @@ "Le fichier de paramètres suivant sera utilisée pour copier les mots-clés " "depuis la première image vers le panorama final.\n" "Elle est appliquée en plus du fichier de paramètres ci-dessus pour les " -"images intermédiaires.\n" -"Les marques substitutives du fichier de paramètres seront replacées avant de " -"faire tourner exiftool." +"images intermédiaires." #: hugin1/hugin/xrc/pref_dialog.xrc:1030 msgid "Final ExifTool argfile:" @@ -7459,6 +7463,9 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." msgstr "" +"Ce fichier de paramètres (argfile) est utilisé avec la ligne de commande " +"suivante\n" +"\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1591 hugin1/hugin/xrc/pref_dialog.xrc:1658 msgid "Edit ExifTool argfile" @@ -7469,9 +7476,11 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" +"Ce fichier de paramètres (argfile) est utilisé avec la ligne de commande " +"suivante\n" +"\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1616 -#, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7490,8 +7499,8 @@ "\n" "The placeholders are case sensitive." msgstr "" -"Les marques substitutives suivantes seront remplacées avant d’appeler " -"ExifTool :\n" +"Les marques substitutives suivantes seront remplacées avant d'exécuter le " +"programme ExifTool :\n" "%projection - nom de la projection (en anglais)\n" "%projectionNumber - numéro de projection\n" "%hfov - champ de vue horizontal du panorama\n" diff -Nru hugin-2017.0.0~beta1+dfsg/src/translations/hu.po hugin-2017.0.0+dfsg/src/translations/hu.po --- hugin-2017.0.0~beta1+dfsg/src/translations/hu.po 2017-04-29 16:05:51.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/translations/hu.po 2017-06-10 07:25:25.000000000 +0000 @@ -1,16 +1,16 @@ msgid "" msgstr "" -"Project-Id-Version: Hugin 2016.2.0\n" +"Project-Id-Version: Hugin 2017.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2017-04-29 10:16+0200\n" -"PO-Revision-Date: 2016-06-12 20:56+0100\n" +"PO-Revision-Date: 2017-06-02 08:11+0100\n" "Last-Translator: Höss Lajos \n" "Language-Team: Balló György \n" "Language: hu_HU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.3\n" +"X-Generator: Poedit 2.0.2\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,891,-1,-1,-1,-1,-1\n" #: hugin1/base_wx/AssistantExecutor.cpp:65 @@ -829,15 +829,14 @@ "kép." #: hugin1/base_wx/wxPanoCommand.cpp:299 -#, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " "again." msgstr "" -"A Hugin nem támogatja ezt a keverést. Kihagyom ezt a képet.\n" -"Konvertálja a képet szürkeárnyalatos vagy RGB képpé és próbálja újra " -"betölteni." +"A Hugin nem támogatja ezt a keverést. Kihagyja ezt a képet.\n" +"Konvertálja a képet szürkeárnyalatos vagy RGB képpé egyenként és próbálja " +"újra betölteni." #: hugin1/base_wx/wxPanoCommand.cpp:316 #, c-format @@ -2476,16 +2475,13 @@ msgstr "Kimenet" #: hugin1/hugin/MainFrame.cpp:462 -#, fuzzy, c-format +#, c-format msgid "User defined sequence: %s" -msgstr "" -"Nem lehet megnyitni a felhasználó által megadott kimeneti sorrendet \"%s\"." +msgstr "Felhasználó által meghatározott sorrend: %s" #: hugin1/hugin/MainFrame.cpp:478 hugin1/hugin/MainFrame.cpp:1913 -#, fuzzy msgid "User defined output sequences" -msgstr "" -"Nem lehet megnyitni a felhasználó által megadott kimeneti sorrendet \"%s\"." +msgstr "Felhasználó által meghatározott kimeneti sorrendek" #: hugin1/hugin/MainFrame.cpp:572 msgid "Started" @@ -2503,42 +2499,40 @@ msgstr "Expozíció" #: hugin1/hugin/MainFrame.cpp:767 -#, fuzzy msgid "Save changes to the panorama before opening an other project?" -msgstr "Mentse a panoráma változásait bezárás előtt?" +msgstr "Mentse a változásokat a panorámába egy másik projekt megnyitása előtt?" #: hugin1/hugin/MainFrame.cpp:770 -#, fuzzy msgid "Save changes to the panorama before starting a new project?" -msgstr "Mentse a panoráma változásait bezárás előtt?" +msgstr "Mentse a változásokat a panorámába az új projekt megkezdése előtt?" #: hugin1/hugin/MainFrame.cpp:774 msgid "Save changes to the panorama before closing?" msgstr "Mentse a panoráma változásait bezárás előtt?" #: hugin1/hugin/MainFrame.cpp:787 -#, fuzzy msgid "" "If you load an other project without saving, your changes since your last " "save will be discarded." msgstr "" -"Ha bezárja mentés nélkül, az utolsó mentés utáni módosítások el fognak veszni" +"Ha egy másik projektet megnyit mentés nélkül, az utolsó mentés utáni " +"módosítások el fognak veszni." #: hugin1/hugin/MainFrame.cpp:790 -#, fuzzy msgid "" "If you start a new project without saving, your changes since your last save " "will be discarded." msgstr "" -"Ha bezárja mentés nélkül, az utolsó mentés utáni módosítások el fognak veszni" +"Ha új projektet kezd mentés nélkül, az utolsó mentés utáni módosítások el " +"fognak veszni." #: hugin1/hugin/MainFrame.cpp:794 -#, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -"Ha bezárja mentés nélkül, az utolsó mentés utáni módosítások el fognak veszni" +"Ha bezárja mentés nélkül, az utolsó mentés utáni módosítások el fognak " +"veszni." #: hugin1/hugin/MainFrame.cpp:799 msgid "Don't Save" @@ -2587,7 +2581,7 @@ #: hugin1/hugin/MainFrame.cpp:947 msgid "Save PTmender script file" -msgstr " PTmender szkriptfájl mentése" +msgstr "PTmender szkriptfájl mentése" #: hugin1/hugin/MainFrame.cpp:949 msgid "PTmender files (*.txt)|*.txt" @@ -2631,6 +2625,9 @@ "This file is not a valid image.\n" "This file will be removed from the project." msgstr "" +"Nem sikerült betölteni a(z) \"%s\" képet.\n" +"Ez a fájl nem érvényes kép.\n" +"Ez a fájl törölve lesz a projektbõl." #: hugin1/hugin/MainFrame.cpp:1246 #, c-format @@ -2639,6 +2636,10 @@ "This file was renamed, deleted or is on a non-accessible drive.\n" "This file will be removed from the project." msgstr "" +"Nem sikerült betölteni a(z) \"%s\" képet.\n" +"Ezt a fájlt átnevezték, törölték vagy egy nem hozzáférhető meghajtón " +"található.\n" +"Ez a fájl törölve lesz a projektbõl." #: hugin1/hugin/MainFrame.cpp:1571 #, c-format @@ -2778,6 +2779,8 @@ "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" +"A segéd nem talált függőleges vonalakat. Kérjük, adjon hozzá a függõleges " +"vonalakat a panoráma szerkesztõben, és manuálisan optimalizálja a projektet." #: hugin1/hugin/MainFrame.cpp:2275 #, c-format @@ -3575,22 +3578,21 @@ msgstr "Nem lehet menteni a fájlt \"%s\"." #: hugin1/hugin/PreferencesDialog.cpp:447 -#, fuzzy, c-format +#, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" "%s fájl nem létezik.\n" -"Hozzon létre üres arg. fájlt?" +"Hozzon létre egy minta arg fájlt?" #: hugin1/hugin/PreferencesDialog.cpp:462 -#, fuzzy msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" "Nincs fájl kiválasztva.\n" -"Hozzon létre üres arg. fájlt?" +"Hozzon létre egy minta arg fájlt?" #: hugin1/hugin/PreferencesDialog.cpp:781 msgid "Really reset displayed preferences to default values?" @@ -3737,6 +3739,9 @@ "Error: %s\n" "One cause could be an invalid or missing image file." msgstr "" +"Nem lehet összefűzni az elõnézetet.\n" +"Hiba: %s\n" +"Az egyik lehetséges ok egy érvénytelen vagy hiányzó képfájl lehet." #: hugin1/hugin/huginApp.cpp:218 #, c-format @@ -4148,9 +4153,8 @@ msgstr "Válasszon ki egy projektet" #: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 -#, fuzzy msgid "Please select only one project" -msgstr "Válasszon ki egy projektet" +msgstr "Csak egy projektet jelöljön ki." #: hugin1/ptbatcher/BatchFrame.cpp:647 msgid "Specify batch file to open" @@ -5802,9 +5806,8 @@ msgstr "&Minden pont finomhangolása" #: hugin1/hugin/xrc/main_menu.xrc:40 -#, fuzzy msgid "Runs fine-tune on all control points." -msgstr "%lu kontroll pontok eltávolítása" +msgstr "Minden kontrol ponton finomhangolást futtat." #: hugin1/hugin/xrc/main_menu.xrc:43 msgid "Remove control points in masks" @@ -6809,7 +6812,7 @@ msgstr "Alapértelmezett kimeneti előtag:" #: hugin1/hugin/xrc/pref_dialog.xrc:230 -#, fuzzy, c-format +#, c-format msgid "" "The following placeholders are replaced automatically:\n" "%firstimage - filename of first image file\n" @@ -6832,12 +6835,12 @@ "%directory - mappa neve (az első kép fájl alapján)\n" "%projection - vetület neve\n" "%focallength - fókusztávolság\n" -"%date - dátum (az első kép alapján)\n" -"%time - idő (az első kép alapján)\n" -"%maker - kamera gyártó (az első kép alapján)\n" -"%model - kamera modell (az első kép alapján)\n" -"%lens - objektív (az első kép alapján)\n" -"%projectname - projekt fájlnév (csak kimeneti előtag)" +"%date - dátum (az első kép dátuma)\n" +"%time - idő (az első kép ideje)\n" +"%maker - kamera márkája (az első képre vonatkozóan)\n" +"%model - kamera modell (az első képre vonatkozóan)\n" +"%lens - objektív (az első képre vonatkozóan)\n" +"%projectname - projekt fájlnév (csak a kimeneti előtaghoz)" #: hugin1/hugin/xrc/pref_dialog.xrc:252 msgid "Default filenames" @@ -7124,16 +7127,19 @@ "To create an example argfile leave the text boxes empty and press \"Edit..." "\"." msgstr "" +"Ezeket az arg fájlokat használja a képfájlban lévő metaadatok végső " +"panorámába másolásához.\n" +"Az alapértelmezett értékek használatához hagyja üresen a szövegdobozokat.\n" +"Minta arg fájl létrehozásához hagyja üresen a szövegdobozokat, és nyomja meg " +"a \"Szerkesztés...\" gombot." #: hugin1/hugin/xrc/pref_dialog.xrc:955 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -"A következő argfájlt fogja használni hogy az első képből a címkéket " -"átmásolja minden köztes képhez.\n" -"A mezők nem lesznek cserélve." +"A következő arg fájlt fogja használni hogy az első képből a címkéket " +"átmásolja minden köztes képhez." #: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Intermediate ExifTool argfile:" @@ -7141,23 +7147,21 @@ #: hugin1/hugin/xrc/pref_dialog.xrc:977 hugin1/hugin/xrc/pref_dialog.xrc:1036 msgid "Leave empty for default" -msgstr "üresen hagyva az alapértelmezett" +msgstr "Üresen hagyva az alapértelmezett" #: hugin1/hugin/xrc/pref_dialog.xrc:994 hugin1/hugin/xrc/pref_dialog.xrc:1053 msgid "Edit selected ExifTool argfile" msgstr "Kiválasztott ExifTool arg. fájl szerkesztése" #: hugin1/hugin/xrc/pref_dialog.xrc:1013 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" "It is applied additional to the above argfile for the intermediate images." msgstr "" -"A következő argfájlt fogja használni hogy az első képből a címkéket " +"A következő arg fájlt fogja használni hogy az első képből a címkéket " "átmásolja a végleges panorámába.\n" -"Ez a fenti argfájlon felül lesz felhasználva a köztes képekhez.\n" -"A mezők ebben az argfájlban cserélve lesznek az exiftool futtatása előtt." +"Ezekkel lesz kiegészítve a fenti arg fájl a köztes képekre." #: hugin1/hugin/xrc/pref_dialog.xrc:1030 msgid "Final ExifTool argfile:" @@ -7307,7 +7311,7 @@ #: hugin1/hugin/xrc/pref_dialog.xrc:1431 msgid "Number of points per image: " -msgstr "Pontok száma képenként:" +msgstr "Pontok száma képenként: " #: hugin1/hugin/xrc/pref_dialog.xrc:1446 msgid "Photometric optimizer" @@ -7358,6 +7362,8 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." msgstr "" +"Ezt az arg fájl parancssorral van meghívva\n" +"\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1591 hugin1/hugin/xrc/pref_dialog.xrc:1658 msgid "Edit ExifTool argfile" @@ -7368,9 +7374,10 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" +"Ezt az arg fájl parancssorral van meghívva\n" +"\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1616 -#, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7401,7 +7408,7 @@ "%fullheight - a kimeneti rajzvászon magassága\n" "%width - a kimeneti terület szélessége\n" "%height - a kimeneti terület magassága\n" -"%projectname - pto projekt fájl neve\n" +"%projectname - pto projekt fájl neve\n" "\n" "A mezők kis/nagybetű érzékenyek." diff -Nru hugin-2017.0.0~beta1+dfsg/src/translations/it.po hugin-2017.0.0+dfsg/src/translations/it.po --- hugin-2017.0.0~beta1+dfsg/src/translations/it.po 2017-04-29 16:05:51.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/translations/it.po 2017-05-15 15:04:19.000000000 +0000 @@ -36,7 +36,7 @@ "Project-Id-Version: hugin 0.8\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2017-04-29 10:16+0200\n" -"PO-Revision-Date: 2016-12-03 16:19+0100\n" +"PO-Revision-Date: 2017-05-07 16:39+0200\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" "Language: it\n" @@ -826,7 +826,7 @@ "Convert image to grayscale image and try loading again." msgstr "" "Il file \"%s\" è un'immagine in bianco e nero.\n" -"Hugin non supporta questo tipo di immagine, pertanto verrà saltata.\n" +"Hugin non supporta questo tipo di immagine, pertanto verrà scartata.\n" "Convertire l'immagine in scala di grigi e ricaricarla di nuovo." #: hugin1/base_wx/wxPanoCommand.cpp:278 @@ -842,7 +842,7 @@ "Hugin supporta solo le immagini RGB o in scala di grigi (con o senza canale " "alfa).\n" "Il file \"%s\" ha %d canali e %d canali extra (probabilmente canali alfa).\n" -"Hugin non supporta questo tipo di immagini e pertanto verranno saltate.\n" +"Hugin non supporta questo tipo di immagini e pertanto verranno scartate.\n" "Convertire l'immagine in scala di grigi o in RGB e caricarla di nuovo." #: hugin1/base_wx/wxPanoCommand.cpp:288 @@ -871,13 +871,13 @@ "in scala di grigi." #: hugin1/base_wx/wxPanoCommand.cpp:299 -#, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " "again." msgstr "" -"Hugin non supporta questo tipo di immagine, pertanto verrà saltata.\n" +"Hugin non supporta questo tipo di associazione, pertanto questa immagine " +"verrà scartata.\n" "Convertire l'immagine in scala di grigi o RGB e ricaricarla di nuovo." #: hugin1/base_wx/wxPanoCommand.cpp:316 @@ -2546,14 +2546,13 @@ msgstr "Output" #: hugin1/hugin/MainFrame.cpp:462 -#, fuzzy, c-format +#, c-format msgid "User defined sequence: %s" -msgstr "Impossibile aprire la sequenza di output \"%s\" definita dall'utente" +msgstr "Sequenza definita dall'utente: %s" #: hugin1/hugin/MainFrame.cpp:478 hugin1/hugin/MainFrame.cpp:1913 -#, fuzzy msgid "User defined output sequences" -msgstr "Impossibile aprire la sequenza di output \"%s\" definita dall'utente" +msgstr "Sequenze di output definite dall'utente" #: hugin1/hugin/MainFrame.cpp:572 msgid "Started" @@ -2571,39 +2570,34 @@ msgstr "Esposizione" #: hugin1/hugin/MainFrame.cpp:767 -#, fuzzy msgid "Save changes to the panorama before opening an other project?" -msgstr "Salvare le modifiche al panorama prima di chiudere?" +msgstr "Salvare le modifiche al panorama prima di aprire un altro progetto?" #: hugin1/hugin/MainFrame.cpp:770 -#, fuzzy msgid "Save changes to the panorama before starting a new project?" -msgstr "Salvare le modifiche al panorama prima di chiudere?" +msgstr "Salvare le modifiche al panorama prima di iniziare un nuovo progetto?" #: hugin1/hugin/MainFrame.cpp:774 msgid "Save changes to the panorama before closing?" msgstr "Salvare le modifiche al panorama prima di chiudere?" #: hugin1/hugin/MainFrame.cpp:787 -#, fuzzy msgid "" "If you load an other project without saving, your changes since your last " "save will be discarded." msgstr "" -"Se si chiude senza salvare, i cambiamenti dall'ultimo salvataggio saranno " -"perduti" +"Se si carica un altro progetto senza salvare, i cambiamenti dall'ultimo " +"salvataggio saranno perduti" #: hugin1/hugin/MainFrame.cpp:790 -#, fuzzy msgid "" "If you start a new project without saving, your changes since your last save " "will be discarded." msgstr "" -"Se si chiude senza salvare, i cambiamenti dall'ultimo salvataggio saranno " -"perduti" +"Se si inizia un nuovo progetto senza salvare, i cambiamenti dall'ultimo " +"salvataggio saranno perduti" #: hugin1/hugin/MainFrame.cpp:794 -#, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2703,6 +2697,9 @@ "This file is not a valid image.\n" "This file will be removed from the project." msgstr "" +"Impossibile caricare l'immagine «%s».\n" +"Il file non è un'immagine valida.\n" +"Questo file verrà rimosso dal progetto." #: hugin1/hugin/MainFrame.cpp:1246 #, c-format @@ -2711,6 +2708,10 @@ "This file was renamed, deleted or is on a non-accessible drive.\n" "This file will be removed from the project." msgstr "" +"Impossibile caricare l'immagine «%s».\n" +"Il file è stato rinominato, cancellato o è su un dispositivo non " +"accessibile.\n" +"Questo file verrà rimosso dal progetto." #: hugin1/hugin/MainFrame.cpp:1571 #, c-format @@ -2850,6 +2851,8 @@ "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" +"L'assistente non ha individuato linee verticali. Aggiungere le linee " +"verticaleìi nell'editor del panorama e ottimizzare il progetto manualmente." #: hugin1/hugin/MainFrame.cpp:2275 #, c-format @@ -3667,22 +3670,21 @@ msgstr "Impossibile salvare il file «%s»." #: hugin1/hugin/PreferencesDialog.cpp:447 -#, fuzzy, c-format +#, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" "Il file «%s» non esiste.\n" -"Creare un argfile vuoto?" +"Creare un argfile di esempio?" #: hugin1/hugin/PreferencesDialog.cpp:462 -#, fuzzy msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" "Nessun file selezionato.\n" -"Creare un argfile vuoto?" +"Creare un argfile di esempio?" #: hugin1/hugin/PreferencesDialog.cpp:781 msgid "Really reset displayed preferences to default values?" @@ -3841,6 +3843,9 @@ "Error: %s\n" "One cause could be an invalid or missing image file." msgstr "" +"Impossibile unire l'anteprima.\n" +"Errore: %s\n" +"Un apossibile causa potrebbe essere una immagine mancante o non valida." #: hugin1/hugin/huginApp.cpp:218 #, c-format @@ -4258,9 +4263,8 @@ msgstr "Selezionare un progetto" #: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 -#, fuzzy msgid "Please select only one project" -msgstr "Selezionare un progetto" +msgstr "Selezionare un solo progetto" #: hugin1/ptbatcher/BatchFrame.cpp:647 msgid "Specify batch file to open" @@ -5928,9 +5932,8 @@ msgstr "&Regolazione precisa di tutti i punti" #: hugin1/hugin/xrc/main_menu.xrc:40 -#, fuzzy msgid "Runs fine-tune on all control points." -msgstr "&Regolazione precisa dei punti di controllo" +msgstr "Esegue la regolazione precisa su tutti i punti di controllo" #: hugin1/hugin/xrc/main_menu.xrc:43 msgid "Remove control points in masks" @@ -6958,7 +6961,7 @@ msgstr "Prefisso predefinito dell'output:" #: hugin1/hugin/xrc/pref_dialog.xrc:230 -#, fuzzy, c-format +#, c-format msgid "" "The following placeholders are replaced automatically:\n" "%firstimage - filename of first image file\n" @@ -6974,12 +6977,12 @@ "%lens - lens (of first image)\n" "%projectname - project filename (only for output prefix)" msgstr "" -"I seguenti simboli sono sostituiti automaticamente:\n" +"I seguenti segnaposto sono sostituiti automaticamente:\n" "%firstimage - nome del file della prima immagine\n" "%lastimage - nome del file dell'ultima immagine\n" "%#images - numero di immagini\n" "%directory - nome cartella (basato sul primo file immagine)\n" -"%projection - nome progetto\n" +"%projection - nome proiezione\n" "%focallength - lunghezza focale\n" "%date - data (della prima immagine)\n" "%time - ora (della prima immagine)\n" @@ -7225,7 +7228,7 @@ #: hugin1/hugin/xrc/pref_dialog.xrc:872 msgid "Start stitching jobs immediately" -msgstr "Avvia immediatamento l'assemblaggio" +msgstr "Avvia immediatamente l'assemblaggio" # tooltip #: hugin1/hugin/xrc/pref_dialog.xrc:873 @@ -7280,16 +7283,19 @@ "To create an example argfile leave the text boxes empty and press \"Edit..." "\"." msgstr "" +"Questi argfile sono utilizzati per copiare i metadati dal file di immagine " +"al panorama finale.\n" +"Lasciare vuoti i campi per usare i valori predefiniti.\n" +"Per creare un argfile di esempio lasciare vuoti i campi e selezionare " +"«Modifica...»." #: hugin1/hugin/xrc/pref_dialog.xrc:955 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" "Il seguente argfile verrà utilizzato per copiare i tag dalla prima immagine " -"alle immagini intermedie.\n" -"I segnaposto non verranno sostituiti" +"alle immagini intermedie." #: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Intermediate ExifTool argfile:" @@ -7304,7 +7310,6 @@ msgstr "Modifica l'argfile ExifTool selezionato" #: hugin1/hugin/xrc/pref_dialog.xrc:1013 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7312,9 +7317,7 @@ msgstr "" "Il seguente argfile verrà utilizzato per copiare i tag dalla prima immagine " "al panorama finale.\n" -"É aggiunto al precedente argfile per le immagini intermedie.\n" -"I segnaposto in questo argfile saranno sostituiti prima dell'esecuzione di " -"exiftool." +"É aggiunto al precedente argfile per le immagini intermedie." #: hugin1/hugin/xrc/pref_dialog.xrc:1030 msgid "Final ExifTool argfile:" @@ -7523,6 +7526,8 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." msgstr "" +"L'argfile è richiamato con la riga di comando\n" +"\"exiftool -overwrite&original -tagsfromfile immagine -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1591 hugin1/hugin/xrc/pref_dialog.xrc:1658 msgid "Edit ExifTool argfile" @@ -7533,9 +7538,11 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" +"L'argfile è richiamato con la riga di comando\n" +"\"exiftool -overwrite&original -tagsfromfile immagine -E -@ argfile panorama" +"\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1616 -#, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" diff -Nru hugin-2017.0.0~beta1+dfsg/src/translations/nl.po hugin-2017.0.0+dfsg/src/translations/nl.po --- hugin-2017.0.0~beta1+dfsg/src/translations/nl.po 2017-04-29 16:05:51.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/translations/nl.po 2017-06-15 16:07:26.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2017-04-29 10:16+0200\n" -"PO-Revision-Date: 2016-06-22 21:45+0200\n" +"PO-Revision-Date: 2017-06-15 09:27+0200\n" "Last-Translator: Harry van der Wolf \n" "Language-Team: American English \n" "Language: nl_NL\n" @@ -27,7 +27,7 @@ # hugin1/hugin/ImagesPanel.cpp:866, c-format #: hugin1/base_wx/AssistantExecutor.cpp:77 msgid "Removing control points in clouds..." -msgstr "Verwijder ijkpunten in wolken..." +msgstr "Verwijderen ijkpunten in wolken..." #: hugin1/base_wx/AssistantExecutor.cpp:83 msgid "Statistically cleaning of control points..." @@ -839,13 +839,12 @@ "project zijn grijstinten afbeeldingen." #: hugin1/base_wx/wxPanoCommand.cpp:299 -#, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " "again." msgstr "" -"Hugin ondersteunt dit vermengen niet. Afbeelding wordt overgeslagen.\n" +"Hugin ondersteunt dit samenvoegen niet. Afbeelding wordt overgeslagen.\n" "Converteer afbeelding naar grijstinten of RGB en open opnieuw." #: hugin1/base_wx/wxPanoCommand.cpp:316 @@ -1152,7 +1151,7 @@ #: hugin1/executor/hugin_executor.cpp:203 msgid "prefix used for stitching" -msgstr "Voorvoegingbgebruikt voor samenvoegen" +msgstr "Voorvoeging gebruikt voor samenvoegen" #: hugin1/executor/hugin_executor.cpp:204 msgid "use user defined commands in given file" @@ -2489,14 +2488,13 @@ msgstr "Te produceren uitvoer:" #: hugin1/hugin/MainFrame.cpp:462 -#, fuzzy, c-format +#, c-format msgid "User defined sequence: %s" -msgstr "Kan gebruikers gedefinieerde uitvoer sequentie \"%s\" niet openen." +msgstr "Gebruiker gedefinieerde volgorde: %s" #: hugin1/hugin/MainFrame.cpp:478 hugin1/hugin/MainFrame.cpp:1913 -#, fuzzy msgid "User defined output sequences" -msgstr "Kan gebruikers gedefinieerde uitvoer sequentie \"%s\" niet openen." +msgstr "Gebruiker gedefinieerde volgordes" #: hugin1/hugin/MainFrame.cpp:572 msgid "Started" @@ -2514,42 +2512,39 @@ msgstr "Belichting" #: hugin1/hugin/MainFrame.cpp:767 -#, fuzzy msgid "Save changes to the panorama before opening an other project?" -msgstr "Panorama wijzigingen bewaren voor afsluiten?" +msgstr "Panorama wijzigingen bewaren voor openen van volgend project?" #: hugin1/hugin/MainFrame.cpp:770 -#, fuzzy msgid "Save changes to the panorama before starting a new project?" -msgstr "Panorama wijzigingen bewaren voor afsluiten?" +msgstr "Panorama wijzigingen bewaren voor starten van nieuw project?" #: hugin1/hugin/MainFrame.cpp:774 msgid "Save changes to the panorama before closing?" msgstr "Panorama wijzigingen bewaren voor afsluiten?" #: hugin1/hugin/MainFrame.cpp:787 -#, fuzzy msgid "" "If you load an other project without saving, your changes since your last " "save will be discarded." msgstr "" -"Als u afsluit zonder opslaan worden uw laatste wijzigingen niet bewaard" +"Als u een ander project laadt zonder nu eerst op te slaan, worden uw laatste " +"wijzigingen niet bewaard" #: hugin1/hugin/MainFrame.cpp:790 -#, fuzzy msgid "" "If you start a new project without saving, your changes since your last save " "will be discarded." msgstr "" -"Als u afsluit zonder opslaan worden uw laatste wijzigingen niet bewaard" +"Als u een nieuw project start zonder eerst op te slaan, worden uw laatste " +"wijzigingen niet bewaard" #: hugin1/hugin/MainFrame.cpp:794 -#, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -"Als u afsluit zonder opslaan worden uw laatste wijzigingen niet bewaard" +"Als u afsluit zonder opslaan, worden uw laatste wijzigingen niet bewaard" #: hugin1/hugin/MainFrame.cpp:799 msgid "Don't Save" @@ -2642,6 +2637,9 @@ "This file is not a valid image.\n" "This file will be removed from the project." msgstr "" +"Kan afbeelding \"%s\" niet laden.\n" +"Dit bestand is geen correcte afbeelding.\n" +"Het bestand wordt verwijderd uit het project." #: hugin1/hugin/MainFrame.cpp:1246 #, c-format @@ -2650,6 +2648,9 @@ "This file was renamed, deleted or is on a non-accessible drive.\n" "This file will be removed from the project." msgstr "" +"Kan afbeelidng \"%s\" niet laden.\n" +"Het bestand is hernoemd, verwijderd of op een niet toegankelijke locatie.\n" +"Het bestandwordt verwijderd uit het project." #: hugin1/hugin/MainFrame.cpp:1571 #, c-format @@ -2790,6 +2791,8 @@ "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" +"De Assistent kon geen verticale lijnen vinden. Voeg aub verticale lijnen toe " +"in de panorama editor en optimaliseer het project handmatig." #: hugin1/hugin/MainFrame.cpp:2275 #, c-format @@ -3592,22 +3595,21 @@ msgstr "Kan bestand \"%s\" niet opslaan:" #: hugin1/hugin/PreferencesDialog.cpp:447 -#, fuzzy, c-format +#, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" "Bestand %s bestaat niet.\n" -"Moet een leeg arg bestand gemaakt worden?" +"Moet een voorbeeld arg bestand gemaakt worden?" #: hugin1/hugin/PreferencesDialog.cpp:462 -#, fuzzy msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" "Geen bestand geselecteerd.\n" -"Moet een leeg arg bestand gemaakt worden?" +"Moet een voorbeeld arg bestand gemaakt worden?" #: hugin1/hugin/PreferencesDialog.cpp:781 msgid "Really reset displayed preferences to default values?" @@ -3758,6 +3760,9 @@ "Error: %s\n" "One cause could be an invalid or missing image file." msgstr "" +"Samenvoegen tot voorbeeld mislukt.\n" +"Fout: %s\n" +"Een incorrecte of missende afbeelding kan een oorzaak zijn." #: hugin1/hugin/huginApp.cpp:218 #, c-format @@ -4167,9 +4172,8 @@ msgstr "Kies een project" #: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 -#, fuzzy msgid "Please select only one project" -msgstr "Kies een project" +msgstr "Selecteer slechts één project" #: hugin1/ptbatcher/BatchFrame.cpp:647 msgid "Specify batch file to open" @@ -5819,9 +5823,8 @@ # hugin1/hugin/ImagesPanel.cpp:866, c-format #: hugin1/hugin/xrc/main_menu.xrc:40 -#, fuzzy msgid "Runs fine-tune on all control points." -msgstr "Verwijderen van %lu ijkpunten" +msgstr "Voert een fine-tuning uit op alle controle puntent" # hugin1/hugin/ImagesPanel.cpp:866, c-format #: hugin1/hugin/xrc/main_menu.xrc:43 @@ -6826,7 +6829,7 @@ msgstr "Staandaard uitvoer voorloop" #: hugin1/hugin/xrc/pref_dialog.xrc:230 -#, fuzzy, c-format +#, c-format msgid "" "The following placeholders are replaced automatically:\n" "%firstimage - filename of first image file\n" @@ -6854,7 +6857,7 @@ "%maker - camera maker (van eerste afbeelding)\n" "%model - camera model (van eerste afbeelding)\n" "%lens - lens (van eerste afbeelding)\n" -"%projectname - project bestandsnaam (alleen voor voorloop uitvoer naam)" +"%projectname - project bestandsnaam (alleen voor voorvoegsel uitvoer naam)" #: hugin1/hugin/xrc/pref_dialog.xrc:252 msgid "Default filenames" @@ -7142,16 +7145,19 @@ "To create an example argfile leave the text boxes empty and press \"Edit..." "\"." msgstr "" +"Deze arg bestanden worden gebruikt om metadata van de afbeelding naar het " +"uiteindelijke panorama te kopieren.\n" +"Laat de invulvelden leeg om standaard waarden te gebruiken.\n" +"Laat de invulvelden leeg en druk op \"Edit\" om een voorbeeld arg bestand te " +"maken." #: hugin1/hugin/xrc/pref_dialog.xrc:955 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" "Het volgende arg bestand wordt gebruikt om de labels uit de eerste " -"afbeelding te kopiëren naar de tussen afbeeldingen.\n" -"Panorama labels zullen niet aangepast worden." +"afbeelding te kopiëren naar de tussen afbeeldingen." #: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Intermediate ExifTool argfile:" @@ -7166,7 +7172,6 @@ msgstr "Bewerk geselecteerde ExifTool arg bestand" #: hugin1/hugin/xrc/pref_dialog.xrc:1013 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7174,9 +7179,8 @@ msgstr "" "Het volgende arg bestand wordt gebruikt om labels uit de eerste afbeelding " "naar het uiteindelijke panorama te kopiëren.\n" -"Het wordt bovenop het arg bestand voor de tussen afbeeldingen toegepast.\n" -"Panorama labels in het arg bestand worden vervangen voor uitvoering van " -"exiftool." +"Het wordt toegepast bovenop het arg bestand voor de tussen afbeeldingen " +"toegepast." #: hugin1/hugin/xrc/pref_dialog.xrc:1030 msgid "Final ExifTool argfile:" @@ -7339,7 +7343,7 @@ #: hugin1/hugin/xrc/pref_dialog.xrc:1458 msgid "Show message about saving project file and output prefix" -msgstr "Toon melding over opslaan project bestand en voorloopnaam uitvoer" +msgstr "Toon melding over opslaan project bestand en voorvoegsel uitvoer" #: hugin1/hugin/xrc/pref_dialog.xrc:1465 msgid "Show warning about big exposure difference when adding images" @@ -7380,6 +7384,9 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." msgstr "" +"Het arg bestand wordt op de commando regel aangeroepen met\n" +"\"exiftool -overwrite&original -tagsfromfile afbeelding -@ arg-bestand " +"panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1591 hugin1/hugin/xrc/pref_dialog.xrc:1658 msgid "Edit ExifTool argfile" @@ -7390,9 +7397,11 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" +"Dit arg bestand wordt op de commando regel aangeroepen met\n" +"\"exiftool -overwrite&original -tagsfromfile afbeelding -E -@ arg-bestand " +"panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1616 -#, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7416,7 +7425,7 @@ "%projection - projectie naam (Engels)\n" "%projectionNumber - nummer van de projectie\n" "%hfov - horizontale beeldhoek van het panorama\n" -"%vfov - verticale beeldhoekvan het panorama\n" +"%vfov - verticale beeldhoek van het panorama\n" "%ev - belichtingswaarde van het panorama\n" "%nrImages - aantal actieve afbeeldingen\n" "%nrAllImages - totaal aantal afbeeldingen in project (inclusief inactieve " diff -Nru hugin-2017.0.0~beta1+dfsg/src/translations/pt_BR.po hugin-2017.0.0+dfsg/src/translations/pt_BR.po --- hugin-2017.0.0~beta1+dfsg/src/translations/pt_BR.po 2017-04-29 16:05:52.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/translations/pt_BR.po 2017-05-23 17:26:24.000000000 +0000 @@ -4,14 +4,14 @@ # This file is distributed under the same license as the hugin package. # # Ademar de Souza Reis Jr. , 2005, 2006, 2007, 2009. -# Carlos Eduardo G. Carvalho , 2016 +# Carlos Eduardo G. Carvalho , 2016. # Luís Henrique Camargo Quiroz , 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2017-04-29 10:16+0200\n" -"PO-Revision-Date: 2017-01-30 19:59-0300\n" +"PO-Revision-Date: 2017-05-16 10:08-0300\n" "Last-Translator: Luis Henrique Camargo Quiroz \n" "Language-Team: Portuguese \n" "Language: pt_BR\n" @@ -2514,39 +2514,34 @@ msgstr "Exposição" #: hugin1/hugin/MainFrame.cpp:767 -#, fuzzy msgid "Save changes to the panorama before opening an other project?" -msgstr "Gravar alterações do panorama antes de sair?" +msgstr "Gravar alterações no panorama antes de abrir outro projeto?" #: hugin1/hugin/MainFrame.cpp:770 -#, fuzzy msgid "Save changes to the panorama before starting a new project?" -msgstr "Gravar alterações do panorama antes de sair?" +msgstr "Gravar alterações do panorama antes de começar um novo projeto?" #: hugin1/hugin/MainFrame.cpp:774 msgid "Save changes to the panorama before closing?" msgstr "Gravar alterações do panorama antes de sair?" #: hugin1/hugin/MainFrame.cpp:787 -#, fuzzy msgid "" "If you load an other project without saving, your changes since your last " "save will be discarded." msgstr "" -"Se você sair sem gravar, as alterações feitas após a última gravação serão " -"perdidas." +"Se você carregar outro projeto sem gravar, as mudanças desde a última " +"gravação serão perdidas." #: hugin1/hugin/MainFrame.cpp:790 -#, fuzzy msgid "" "If you start a new project without saving, your changes since your last save " "will be discarded." msgstr "" -"Se você sair sem gravar, as alterações feitas após a última gravação serão " -"perdidas." +"Se você começar um novo projeto sem gravar, as alterações feitas após a " +"última gravação serão perdidas." #: hugin1/hugin/MainFrame.cpp:794 -#, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2799,6 +2794,8 @@ "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" +"O assistente não conseguiu achar linhas verticais. Por favor adicione linhas " +"no editor de panoramas e otimize o projeto via interface." #: hugin1/hugin/MainFrame.cpp:2275 #, c-format @@ -3598,22 +3595,21 @@ msgstr "Não foi possível gravar o arquivo %s." #: hugin1/hugin/PreferencesDialog.cpp:447 -#, fuzzy, c-format +#, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" "O arquivo %s não existe.\n" -"Criar um arquivo de argumentos vazio?" +"Criar um exemplo de arquivo argfile de argumentos?" #: hugin1/hugin/PreferencesDialog.cpp:462 -#, fuzzy msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" "Nenhum arquivo selecionado.\n" -"Criar arquivo de argumentos com valores padrão?" +"Criar arquivo de exemplo de argumentos?" #: hugin1/hugin/PreferencesDialog.cpp:781 msgid "Really reset displayed preferences to default values?" @@ -4175,9 +4171,8 @@ msgstr "Por favor selecione um projeto" #: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 -#, fuzzy msgid "Please select only one project" -msgstr "Por favor selecione um projeto" +msgstr "Por favor selecione apenas um projeto" #: hugin1/ptbatcher/BatchFrame.cpp:647 msgid "Specify batch file to open" @@ -7154,16 +7149,19 @@ "To create an example argfile leave the text boxes empty and press \"Edit..." "\"." msgstr "" +"Estes arquivos 'argfile' são usados para copiar metadados das imagens para o " +"panorama final.\n" +"Deixe as caixas de texto vazias para usar valores padrão.\n" +"Para criar um arquivo 'argfile' de exemplo deixe as caixas de texto vazias e " +"aperte \"Editar...\"." #: hugin1/hugin/xrc/pref_dialog.xrc:955 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" "O seguinte arquivo de argumentos será usado para copiar etiquetas da " -"primeira imagem para todas as imagens intermediárias.\n" -"Marcadores de posição não serão substituídos." +"primeira imagem para todas as imagens intermediárias." #: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Intermediate ExifTool argfile:" @@ -7178,18 +7176,15 @@ msgstr "Editar arquivo de argumentos ExifTool selecionado" #: hugin1/hugin/xrc/pref_dialog.xrc:1013 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" "It is applied additional to the above argfile for the intermediate images." msgstr "" -"O seguinte arquivo de argumentos será usado para copiar etiquetas da " -"primeira imagem para o panorama final.\n" -"Ele é aplicado adicionalmente ao arquivo de argumentos acima para imagens " -"intermediárias.\n" -"Marcadores de posição neste arquivo serão substituídos antes de executar " -"exiftool." +"O seguinte arquivo 'argfile' de argumentos será usado para copiar etiquetas " +"da primeira imagem para o panorama final.\n" +"Ele é aplicado adicionalmente ao arquivo de argumentos acima para as imagens " +"intermediárias." #: hugin1/hugin/xrc/pref_dialog.xrc:1030 msgid "Final ExifTool argfile:" @@ -7389,6 +7384,8 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." msgstr "" +"Este arquivo 'argfile' é chamado com a linha de comando\n" +"\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1591 hugin1/hugin/xrc/pref_dialog.xrc:1658 msgid "Edit ExifTool argfile" @@ -7399,6 +7396,8 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" +"Este arquivo 'argfile' é chamado com a linha de comando\n" +"\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1616 msgid "" diff -Nru hugin-2017.0.0~beta1+dfsg/src/translations/sk.po hugin-2017.0.0+dfsg/src/translations/sk.po --- hugin-2017.0.0~beta1+dfsg/src/translations/sk.po 2017-04-29 16:05:52.000000000 +0000 +++ hugin-2017.0.0+dfsg/src/translations/sk.po 2017-05-15 15:05:01.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the hugin package. # # Jozef Riha , 2006, 2007, 2008, 2009, 2010, 2011. -# Kornel Benko , 2013, 2014, 2015, 2016. +# Kornel Benko , 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: hugin\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" "POT-Creation-Date: 2017-04-29 10:16+0200\n" -"PO-Revision-Date: 2017-04-07 20:25+0000\n" +"PO-Revision-Date: 2017-05-06 16:09+0000\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -3568,22 +3568,21 @@ msgstr "Súbor \"%s\" sa nedal uložiť." #: hugin1/hugin/PreferencesDialog.cpp:447 -#, fuzzy, c-format +#, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" "Súbor %s neexistuje.\n" -"Vytvoriť prázdny súbor argumentov so štandardnými značkami?" +"Vytvoriť príkladný súbor argumentov?" #: hugin1/hugin/PreferencesDialog.cpp:462 -#, fuzzy msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" "Žiadny súbor nie je vybraný.\n" -"Vytvoriť prázdny súbor argumentov?" +"Vytvoriť príkladný súbor argumentov?" #: hugin1/hugin/PreferencesDialog.cpp:781 msgid "Really reset displayed preferences to default values?" @@ -7095,16 +7094,19 @@ "To create an example argfile leave the text boxes empty and press \"Edit..." "\"." msgstr "" +"Tieto súbory argumentov sú používané na kopírovanie metadát z obrázkového " +"súboru do konečnej panorámy.\n" +"Keď chcete štandardné hodnoty, nechajte textové okienka prázdne.\n" +"Keď chcete vytvoriť príkladný súbor, nechajte textové okienka prázdne, a " +"stlčte \"Úpravy...\"." #: hugin1/hugin/xrc/pref_dialog.xrc:955 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -"Nasledovný súbor argumentov bude použitý pre kopírovanie značiek prvého " -"obrázku do všetkých pomocných obrázkov.\n" -"Zástupné značky ostanú nezmenené." +"Nasledovný súbor argumentov bude použitý pre kopírovanie z prvého obrázku do " +"všetkých pomocných obrázkov." #: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Intermediate ExifTool argfile:" @@ -7119,7 +7121,6 @@ msgstr "Vybrať Exiftool súbor argumentov" #: hugin1/hugin/xrc/pref_dialog.xrc:1013 -#, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7127,8 +7128,7 @@ msgstr "" "Nasledovný súbor argumentov bude použitý pre kopírovanie značiek prvého " "obrázku do cieľovej panorámy.\n" -"Aplikované je to dodatočne k súboru použitým pre pomocné obrázky.\n" -"Zástupné značky v tomto súbore budú nahradené.pred spustením exiftool." +"Aplikované je to dodatočne k súboru použitým pre pomocné obrázky." #: hugin1/hugin/xrc/pref_dialog.xrc:1030 msgid "Final ExifTool argfile:" @@ -7327,6 +7327,8 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." msgstr "" +"Tento súbor je volaný z príkazového riadku\n" +"\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1591 hugin1/hugin/xrc/pref_dialog.xrc:1658 msgid "Edit ExifTool argfile" @@ -7337,6 +7339,8 @@ "This argfile is called with command line\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" +"Tento súbor je volaný z príkazového riadku\n" +"\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." #: hugin1/hugin/xrc/pref_dialog.xrc:1616 msgid "" @@ -7822,7 +7826,7 @@ "Rotating the camera around the entrance pupil (sometimes also called \"nodal " "point\") avoids parallax errors and makes panorama creation a lot easier." msgstr "" -"Rotácia kamery okolo vstupnej bábiky (niekedy známej ako \"uzlový bod\") " +"Rotácia kamery okolo vstupnej bábiky (niekedy známa ako \"uzlový bod\") " "pomôže predísť chybám paralaxy a umožňuje oveľa jednoduchšie vytvorenie " "panorámy."